From a53163366017937b82167fd2976a623e612964f0 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 9 Sep 2015 16:50:49 -0400
Subject: [PATCH] Run gtk-builder-tool simplify over all templates

---
 gtk/gtk-builder-tool.c            |  11 +-
 gtk/ui/gtkaboutdialog.ui          | 168 ++++------
 gtk/ui/gtkactionbar.ui            |   6 +-
 gtk/ui/gtkappchooserdialog.ui     |  52 ++--
 gtk/ui/gtkappchooserwidget.ui     |  20 +-
 gtk/ui/gtkapplication-quartz.ui   |  40 +--
 gtk/ui/gtkassistant.ui            | 119 ++++----
 gtk/ui/gtkcolorchooserdialog.ui   |  22 +-
 gtk/ui/gtkcoloreditor.ui          |  68 ++---
 gtk/ui/gtkcombobox.ui             |   7 +-
 gtk/ui/gtkdialog.ui               |  13 +-
 gtk/ui/gtkfilechooserbutton.ui    |  34 +--
 gtk/ui/gtkfilechooserdialog.ui    |   5 +-
 gtk/ui/gtkfilechooserwidget.ui    | 180 ++++++-----
 gtk/ui/gtkfontbutton.ui           |  24 +-
 gtk/ui/gtkfontchooserdialog.ui    |  20 +-
 gtk/ui/gtkfontchooserwidget.ui    |  77 +++--
 gtk/ui/gtkinfobar.ui              |  18 +-
 gtk/ui/gtklockbutton.ui           |  26 +-
 gtk/ui/gtkmessagedialog.ui        |  31 +-
 gtk/ui/gtkpagesetupunixdialog.ui  | 104 +++----
 gtk/ui/gtkpathbar.ui              |  24 +-
 gtk/ui/gtkplacesview.ui           | 175 ++++-------
 gtk/ui/gtkplacesviewrow.ui        |  41 +--
 gtk/ui/gtkprintunixdialog.ui      | 488 +++++++++++++++---------------
 gtk/ui/gtkrecentchooserdefault.ui |  24 +-
 gtk/ui/gtkscalebutton.ui          |  44 +--
 gtk/ui/gtksearchbar.ui            |  31 +-
 gtk/ui/gtksidebarrow.ui           |  20 +-
 gtk/ui/gtkstatusbar.ui            |  13 +-
 gtk/ui/gtkvolumebutton.ui         |  22 +-
 31 files changed, 887 insertions(+), 1040 deletions(-)

diff --git a/gtk/gtk-builder-tool.c b/gtk/gtk-builder-tool.c
index 1a83468ab5..c5ae1c717c 100644
--- a/gtk/gtk-builder-tool.c
+++ b/gtk/gtk-builder-tool.c
@@ -263,9 +263,13 @@ maybe_emit_property (MyParserData *data)
         bound = TRUE;
       else if (strcmp (data->attribute_names[i], "translatable") == 0)
         translatable = TRUE;
+      else if (strcmp (data->attribute_names[i], "name") == 0)
+        property_name = (const gchar *)data->attribute_values[i];
     }
 
-  if (!translatable)
+  if (!translatable &&
+      !bound &&
+      !needs_explicit_setting (data, class_name, property_name))
     {
       for (i = 0; data->attribute_names[i]; i++)
         {
@@ -274,11 +278,6 @@ maybe_emit_property (MyParserData *data)
               if (data->classes == NULL)
                 break;
 
-              property_name = (const gchar *)data->attribute_values[i];
-
-              if (needs_explicit_setting (data, class_name, property_name))
-                break;
-
               if (value_is_default (data, class_name, property_name, value_string))
                 return;
             }
diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index 8e27a447b9..d2b1dc2b46 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -2,64 +2,53 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="visible">1</property>
     <property name="icon_name">help-about</property>
   </object>
   <template class="GtkAboutDialog" parent="GtkDialog">
-    <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="resizable">False</property>
+    <property name="resizable">0</property>
     <property name="type_hint">dialog</property>
     <child internal-child="headerbar">
       <object class="GtkHeaderBar" id="headerbar1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="show-close-button">True</property>
+        <property name="visible">1</property>
+        <property name="show-close-button">1</property>
         <child type="title">
           <object class="GtkStackSwitcher" id="stack_switcher">
-            <property name="visible">False</property>
             <property name="stack">stack</property>
-            <property name="no-show-all">True</property>
+            <property name="no-show-all">1</property>
           </object>
         </child>
       </object>
     </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkBox" id="box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="visible">1</property>
             <property name="border_width">5</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkImage" id="logo_image">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="icon_name">image-missing</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="fill">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="name_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="label">name label</property>
                 <property name="justify">center</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">0</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -67,104 +56,88 @@
               <object class="GtkStack" id="stack">
                 <property name="width_request">400</property>
                 <property name="height_request">100</property>
-                <property name="visible">True</property>
-                <property name="homogeneous">True</property>
+                <property name="visible">1</property>
                 <property name="transition-type">over-up-down</property>
                 <property name="transition-duration">600</property>
                 <signal name="notify::visible-child" handler="stack_visible_child_notify" swapped="no"/>
                 <child>
                   <object class="GtkBox" id="page_vbox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="visible">1</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">8</property>
                     <child>
                       <object class="GtkLabel" id="version_label">
-                        <property name="can_focus">False</property>
                         <property name="label">version 1.0</property>
                         <property name="justify">center</property>
-                        <property name="selectable">True</property>
-                        <property name="no-show-all">True</property>
+                        <property name="selectable">1</property>
+                        <property name="no-show-all">1</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
+                        <property name="fill">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="comments_label">
-                        <property name="can_focus">False</property>
                         <property name="label">comments</property>
                         <property name="justify">center</property>
-                        <property name="wrap">True</property>
-                        <property name="selectable">True</property>
-                        <property name="no-show-all">True</property>
+                        <property name="wrap">1</property>
+                        <property name="selectable">1</property>
+                        <property name="no-show-all">1</property>
                         <property name="max-width-chars">60</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
+                        <property name="fill">0</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="hbox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="homogeneous">True</property>
+                        <property name="visible">1</property>
+                        <property name="homogeneous">1</property>
                         <child>
                           <object class="GtkLabel" id="website_label">
-                            <property name="can_focus">False</property>
-                            <property name="no_show_all">True</property>
+                            <property name="no_show_all">1</property>
                             <property name="label">http://website.com</property>
-                            <property name="selectable">True</property>
+                            <property name="selectable">1</property>
                             <signal name="activate-link" handler="emit_activate_link" object="GtkAboutDialog" swapped="yes"/>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
+                            <property name="fill">0</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
+                        <property name="fill">0</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="license_label">
-                        <property name="can_focus">False</property>
                         <property name="label">license</property>
-                        <property name="use_markup">True</property>
+                        <property name="use_markup">1</property>
                         <property name="justify">center</property>
-                        <property name="wrap">True</property>
-                        <property name="selectable">True</property>
-                        <property name="no_show_all">True</property>
+                        <property name="wrap">1</property>
+                        <property name="selectable">1</property>
+                        <property name="no_show_all">1</property>
                         <property name="max-width-chars">60</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
+                        <property name="fill">0</property>
                         <property name="pack_type">end</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="copyright_label">
-                        <property name="can_focus">False</property>
                         <property name="label">copyright</property>
                         <property name="justify">center</property>
-                        <property name="wrap">True</property>
-                        <property name="selectable">True</property>
-                        <property name="no-show-all">True</property>
+                        <property name="wrap">1</property>
+                        <property name="selectable">1</property>
+                        <property name="no-show-all">1</property>
                         <property name="max-width-chars">60</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
+                        <property name="fill">0</property>
                         <property name="pack_type">end</property>
                         <property name="position">4</property>
                       </packing>
@@ -172,101 +145,66 @@
                   </object>
                   <packing>
                     <property name="name">main</property>
-                    <property name="title" translatable="yes">About</property>
+                    <property name="title" translatable="1">About</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="credits_page">
-                    <property name="visible">False</property>
-                    <property name="no-show-all">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="no-show-all">1</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">8</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow1">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="hscrollbar_policy">never</property>
                         <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkViewport" id="viewport1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="visible">1</property>
                             <style>
                               <class name="view"/>
                             </style>
                             <child>
                               <object class="GtkGrid" id="credits_grid">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="visible">1</property>
                                 <property name="halign">center</property>
                                 <property name="valign">start</property>
                                 <property name="border_width">5</property>
                                 <property name="orientation">vertical</property>
                                 <property name="row_spacing">2</property>
                                 <property name="column_spacing">8</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </object>
                             </child>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="expand">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="name">credits</property>
-                    <property name="title" translatable="yes">Credits</property>
+                    <property name="title" translatable="1">Credits</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="license_page">
-                    <property name="visible">False</property>
-                    <property name="no-show-all">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="no-show-all">1</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">8</property>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow2">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="hscrollbar_policy">never</property>
                         <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkTextView" id="license_view">
-                            <property name="visible">True</property>
-                            <property name="editable">False</property>
+                            <property name="visible">1</property>
+                            <property name="editable">0</property>
                             <property name="left_margin">8</property>
                             <property name="right_margin">8</property>
-                            <property name="cursor_visible">False</property>
+                            <property name="cursor_visible">0</property>
                             <signal name="event-after" handler="text_view_event_after" swapped="no"/>
                             <signal name="key-press-event" handler="text_view_key_press_event" swapped="no"/>
                             <signal name="motion-notify-event" handler="text_view_motion_notify_event" swapped="no"/>
@@ -274,28 +212,24 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="expand">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="name">license</property>
-                    <property name="title" translatable="yes">License</property>
+                    <property name="title" translatable="1">License</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
+                <property name="expand">1</property>
                 <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
+            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkactionbar.ui b/gtk/ui/gtkactionbar.ui
index 26ee12701a..16fab16bcd 100644
--- a/gtk/ui/gtkactionbar.ui
+++ b/gtk/ui/gtkactionbar.ui
@@ -4,16 +4,16 @@
   <template class="GtkActionBar" parent="GtkBin">
     <child>
       <object class="GtkRevealer" id="revealer">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <child>
           <object class="GtkFrame" id="frame">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <style>
               <class name="action-bar"/>
             </style>
             <child>
               <object class="GtkBox" id="box">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="spacing">6</property>
               </object>
             </child>
diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
index 3c1ef1c0f3..4012a7257c 100644
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -2,7 +2,7 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkAppChooserDialog" parent="GtkDialog">
-    <property name="title" translatable="yes">Select Application</property>
+    <property name="title" translatable="1">Select Application</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -10,11 +10,11 @@
         <property name="spacing">2</property>
         <child>
           <object class="GtkSearchBar" id="search_bar">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <child>
               <object class="GtkSearchEntry" id="search_entry">
-                <property name="visible">True</property>
-                <property name="hexpand">True</property>
+                <property name="visible">1</property>
+                <property name="hexpand">1</property>
                 <property name="max-width-chars">40</property>
               </object>
             </child>
@@ -31,24 +31,24 @@
         </child>
         <child>
           <object class="GtkBox" id="inner_box">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="label">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="label">label</property>
-                <property name="wrap">True</property>
+                <property name="wrap">1</property>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">1</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -56,17 +56,17 @@
     </child>
     <child type="action">
       <object class="GtkButton" id="cancel_button">
-        <property name="visible">True</property>
-        <property name="use_underline">True</property>
-        <property name="label" translatable="yes">_Cancel</property>
+        <property name="visible">1</property>
+        <property name="use_underline">1</property>
+        <property name="label" translatable="1">_Cancel</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="ok_button">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Select</property>
-        <property name="use_underline">True</property>
-        <property name="can_default">True</property>
+        <property name="visible">1</property>
+        <property name="label" translatable="1">_Select</property>
+        <property name="use_underline">1</property>
+        <property name="can_default">1</property>
       </object>
     </child>
     <action-widgets>
@@ -75,19 +75,19 @@
     </action-widgets>
   </template>
   <object class="GtkButton" id="show_more_button">
-    <property name="label" translatable="yes">_View All Applications</property>
-    <property name="visible">True</property>
-    <property name="use_underline">True</property>
-    <property name="can_focus">True</property>
-    <property name="receives_default">True</property>
+    <property name="label" translatable="1">_View All Applications</property>
+    <property name="visible">1</property>
+    <property name="use_underline">1</property>
+    <property name="can_focus">1</property>
+    <property name="receives_default">1</property>
     <signal name="clicked" handler="show_more_button_clicked_cb" swapped="no"/>
   </object>
   <object class="GtkButton" id="software_button">
-    <property name="label" translatable="yes">_Find New Applications</property>
-    <property name="visible">True</property>
-    <property name="use_underline">True</property>
-    <property name="can_focus">True</property>
-    <property name="receives_default">True</property>
+    <property name="label" translatable="1">_Find New Applications</property>
+    <property name="visible">1</property>
+    <property name="use_underline">1</property>
+    <property name="can_focus">1</property>
+    <property name="receives_default">1</property>
     <signal name="clicked" handler="software_button_clicked_cb" swapped="no"/>
   </object>
   <object class="GtkSizeGroup" id="buttons">
diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui
index 2fe13a57ca..405defcb11 100644
--- a/gtk/ui/gtkappchooserwidget.ui
+++ b/gtk/ui/gtkappchooserwidget.ui
@@ -32,21 +32,21 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkOverlay" id="overlay">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolled_window">
             <property name="width_request">400</property>
             <property name="height_request">300</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="hscrollbar_policy">never</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkTreeView" id="program_list">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
                 <property name="model">program_list_sort</property>
-                <property name="headers_visible">False</property>
+                <property name="headers_visible">0</property>
                 <signal name="button-press-event" handler="widget_button_press_event_cb" swapped="no"/>
                 <signal name="row-activated" handler="program_list_selection_activated" swapped="no"/>
                 <child internal-child="selection">
@@ -101,7 +101,7 @@
             <property name="valign">center</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">gnome-software-symbolic</property>
                 <property name="pixel-size">48</property>
                 <property name="margin">12</property>
@@ -112,8 +112,8 @@
             </child>
             <child>
               <object class="GtkLabel" id="no_apps_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">No applications found.</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">No applications found.</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <attributes>
@@ -128,7 +128,7 @@
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
       </packing>
     </child>
   </template>
diff --git a/gtk/ui/gtkapplication-quartz.ui b/gtk/ui/gtkapplication-quartz.ui
index 876e1c59fe..1f48d0e976 100644
--- a/gtk/ui/gtkapplication-quartz.ui
+++ b/gtk/ui/gtkapplication-quartz.ui
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk30">
-  <menu id='app-menu'>
+  <menu id="app-menu">
     <section>
       <item>
         <!-- used for the application menu on MacOS.  %s is replaced with the application name. -->
-        <attribute name='label' translatable='yes'>About %s</attribute>
-        <attribute name='action'>app.about</attribute>
-        <attribute name='x-gtk-private-special'>replace-appname</attribute>
+        <attribute name="label" translatable="yes">About %s</attribute>
+        <attribute name="action">app.about</attribute>
+        <attribute name="x-gtk-private-special">replace-appname</attribute>
       </item>
     </section>
     <section>
       <item>
         <!-- used for the application menu on MacOS -->
-        <attribute name='label' translatable='yes'>Preferences</attribute>
-        <attribute name='action'>app.preferences</attribute>
+        <attribute name="label" translatable="yes">Preferences</attribute>
+        <attribute name="action">app.preferences</attribute>
       </item>
     </section>
     <section>
       <item>
         <!-- used for the application menu on MacOS -->
-        <attribute name='label' translatable='yes'>Services</attribute>
-        <attribute name='x-gtk-private-special'>services-submenu</attribute>
+        <attribute name="label" translatable="yes">Services</attribute>
+        <attribute name="x-gtk-private-special">services-submenu</attribute>
       </item>
     </section>
     <section>
       <item>
         <!-- used for the application menu on MacOS.  %s is replaced with the application name. -->
-        <attribute name='label' translatable='yes'>Hide %s</attribute>
-        <attribute name='x-gtk-private-special'>hide-this</attribute>
-        <attribute name='action'>gtkinternal.hide</attribute>
+        <attribute name="label" translatable="yes">Hide %s</attribute>
+        <attribute name="x-gtk-private-special">hide-this</attribute>
+        <attribute name="action">gtkinternal.hide</attribute>
       </item>
       <item>
         <!-- used for the application menu on MacOS -->
-        <attribute name='label' translatable='yes'>Hide Others</attribute>
-        <attribute name='x-gtk-private-special'>hide-others</attribute>
-        <attribute name='action'>gtkinternal.hide-others</attribute>
+        <attribute name="label" translatable="yes">Hide Others</attribute>
+        <attribute name="x-gtk-private-special">hide-others</attribute>
+        <attribute name="action">gtkinternal.hide-others</attribute>
       </item>
       <item>
         <!-- used for the application menu on MacOS -->
-        <attribute name='label' translatable='yes'>Show All</attribute>
-        <attribute name='x-gtk-private-special'>show-all</attribute>
-        <attribute name='action'>gtkinternal.show-all</attribute>
+        <attribute name="label" translatable="yes">Show All</attribute>
+        <attribute name="x-gtk-private-special">show-all</attribute>
+        <attribute name="action">gtkinternal.show-all</attribute>
       </item>
     </section>
     <section>
       <item>
         <!-- used for the application menu on MacOS.  %s is replaced with the application name. -->
-        <attribute name='label' translatable='yes'>Quit %s</attribute>
-        <attribute name='action'>app.quit</attribute>
-        <attribute name='x-gtk-private-special'>replace-appname</attribute>
+        <attribute name="label" translatable="yes">Quit %s</attribute>
+        <attribute name="action">app.quit</attribute>
+        <attribute name="x-gtk-private-special">replace-appname</attribute>
       </item>
     </section>
   </menu>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index a96fa92ca7..513f00f6e1 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -4,167 +4,162 @@
   <template class="GtkAssistant" parent="GtkWindow">
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
       </object>
     </child>
     <child>
       <object class="GtkBox" id="main_box">
-        <property name="visible">True</property>
-        <property name="spacing">0</property>
+        <property name="visible">1</property>
         <child>
           <object class="GtkFrame" id="sidebar_frame">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <style>
               <class name="sidebar"/>
             </style>
             <child>
               <object class="GtkBox" id="sidebar">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
               </object>
             </child>
-            <child type="label_item">
-            </child>
+            <child type="label_item"/>
           </object>
           <packing>
-            <property name="fill">False</property>
+            <property name="fill">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="content_box">
-            <property name="visible">True</property>
-            <property name="border_width">0</property>
+            <property name="visible">1</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">0</property>
             <child>
               <object class="GtkNotebook" id="content">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="show_tabs">False</property>
-                <property name="show_border">False</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="show_tabs">0</property>
+                <property name="show_border">0</property>
                 <signal name="remove" handler="assistant_remove_page_cb" swapped="no"/>
-                <child type="tab">
-                </child>
+                <child type="tab"/>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox" id="action_area">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">end</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkButton" id="apply">
-                    <property name="label" translatable="yes">_Apply</property>
-                    <property name="can_focus">True</property>
-                    <property name="can_default">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="no_show_all">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="label" translatable="1">_Apply</property>
+                    <property name="can_focus">1</property>
+                    <property name="can_default">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="no_show_all">1</property>
+                    <property name="use_underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
                     <signal name="clicked" handler="on_assistant_apply" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="fill">False</property>
+                    <property name="fill">0</property>
                     <property name="pack_type">end</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="forward">
-                    <property name="label" translatable="yes">_Next</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="can_default">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="no_show_all">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="label" translatable="1">_Next</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="can_default">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="no_show_all">1</property>
+                    <property name="use_underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
                     <signal name="clicked" handler="on_assistant_forward" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="fill">False</property>
+                    <property name="fill">0</property>
                     <property name="pack_type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="back">
-                    <property name="label" translatable="yes">_Back</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="no_show_all">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="label" translatable="1">_Back</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="no_show_all">1</property>
+                    <property name="use_underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
                     <signal name="clicked" handler="on_assistant_back" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="fill">False</property>
+                    <property name="fill">0</property>
                     <property name="pack_type">end</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="last">
-                    <property name="label" translatable="yes">_Finish</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="no_show_all">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="label" translatable="1">_Finish</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="no_show_all">1</property>
+                    <property name="use_underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
                     <signal name="clicked" handler="on_assistant_last" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="fill">False</property>
+                    <property name="fill">0</property>
                     <property name="pack_type">end</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="cancel">
-                    <property name="label" translatable="yes">_Cancel</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="no_show_all">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="label" translatable="1">_Cancel</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="no_show_all">1</property>
+                    <property name="use_underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
                     <signal name="clicked" handler="on_assistant_cancel" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="fill">False</property>
+                    <property name="fill">0</property>
                     <property name="pack_type">end</property>
                     <property name="position">4</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="close">
-                    <property name="label" translatable="yes">_Close</property>
-                    <property name="can_focus">True</property>
-                    <property name="can_default">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="no_show_all">True</property>
-                    <property name="use_underline">True</property>
+                    <property name="label" translatable="1">_Close</property>
+                    <property name="can_focus">1</property>
+                    <property name="can_default">1</property>
+                    <property name="receives_default">1</property>
+                    <property name="no_show_all">1</property>
+                    <property name="use_underline">1</property>
                     <style>
                       <class name="text-button"/>
                     </style>
                     <signal name="clicked" handler="on_assistant_close" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="fill">False</property>
+                    <property name="fill">0</property>
                     <property name="pack_type">end</property>
                     <property name="position">5</property>
                   </packing>
@@ -176,7 +171,7 @@
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index 35ce94e7ce..038ac660f8 100644
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -3,16 +3,16 @@
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkColorChooserDialog" parent="GtkDialog">
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Select a Color</property>
+    <property name="title" translatable="1">Select a Color</property>
     <property name="type_hint">dialog</property>
-    <property name="resizable">False</property>
+    <property name="resizable">0</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkColorChooserWidget" id="chooser">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="border_width">5</property>
             <property name="orientation">vertical</property>
             <property name="rgba">rgb(255,255,255)</property>
@@ -21,7 +21,7 @@
             <signal name="notify::show-editor" handler="propagate_notify" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -29,17 +29,17 @@
     </child>
     <child type="action">
       <object class="GtkButton" id="cancel_button">
-        <property name="visible">True</property>
-        <property name="use_underline">True</property>
-        <property name="label" translatable="yes">_Cancel</property>
+        <property name="visible">1</property>
+        <property name="use_underline">1</property>
+        <property name="label" translatable="1">_Cancel</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="ok_button">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Select</property>
-        <property name="use_underline">True</property>
-        <property name="can_default">True</property>
+        <property name="visible">1</property>
+        <property name="label" translatable="1">_Select</property>
+        <property name="use_underline">1</property>
+        <property name="can_default">1</property>
       </object>
     </child>
     <action-widgets>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index 32b9987222..855bd3defb 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -31,11 +31,11 @@
     <signal name="notify::visible" handler="dismiss_current_popup" swapped="no"/>
     <child>
       <object class="GtkOverlay" id="overlay">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <signal name="get-child-position" handler="get_child_position" swapped="no"/>
         <child>
           <object class="GtkGrid" id="grid">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="margin_start">30</property>
             <property name="margin_end">30</property>
             <property name="row_spacing">12</property>
@@ -55,12 +55,12 @@
             </child>
             <child>
               <object class="GtkEntry" id="entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
                 <property name="invisible_char">•</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="entry-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes">Color Name</property>
+                    <property name="AtkObject::accessible-name" translatable="1">Color Name</property>
                   </object>
                 </child>
                 <signal name="activate" handler="entry_apply" swapped="no"/>
@@ -132,7 +132,7 @@
     </child>
   </template>
   <object class="GtkBox" id="a_popup">
-    <property name="no_show_all">True</property>
+    <property name="no_show_all">1</property>
     <style>
       <class name="popover"/>
       <class name="osd"/>
@@ -140,7 +140,7 @@
     <signal name="draw" handler="popup_draw" swapped="no"/>
     <child>
       <object class="GtkGrid" id="grid4">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="margin_start">12</property>
         <property name="margin_end">12</property>
         <property name="margin_top">12</property>
@@ -148,8 +148,8 @@
         <property name="column_spacing">6</property>
         <child>
           <object class="GtkLabel" id="label4">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes" context="Color channel">A</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1" context="Color channel">A</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -158,14 +158,14 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="a_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="invisible_char">•</property>
-            <property name="invisible_char_set">True</property>
+            <property name="invisible_char_set">1</property>
             <property name="climb_rate">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="a_entry-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Alpha</property>
+                <property name="AtkObject::accessible-name" translatable="1">Alpha</property>
               </object>
             </child>
             <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
@@ -179,7 +179,7 @@
     </child>
   </object>
   <object class="GtkBox" id="h_popup">
-    <property name="no_show_all">True</property>
+    <property name="no_show_all">1</property>
     <style>
       <class name="popover"/>
       <class name="osd"/>
@@ -187,7 +187,7 @@
     <signal name="draw" handler="popup_draw" swapped="no"/>
     <child>
       <object class="GtkGrid" id="grid3">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="margin_start">12</property>
         <property name="margin_end">12</property>
         <property name="margin_top">12</property>
@@ -195,8 +195,8 @@
         <property name="column_spacing">6</property>
         <child>
           <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes" context="Color channel">H</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1" context="Color channel">H</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -205,14 +205,14 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="h_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="invisible_char">•</property>
-            <property name="invisible_char_set">True</property>
+            <property name="invisible_char_set">1</property>
             <property name="climb_rate">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="h_entry-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Hue</property>
+                <property name="AtkObject::accessible-name" translatable="1">Hue</property>
               </object>
             </child>
             <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
@@ -226,7 +226,7 @@
     </child>
   </object>
   <object class="GtkBox" id="sv_popup">
-    <property name="no_show_all">True</property>
+    <property name="no_show_all">1</property>
     <style>
       <class name="popover"/>
       <class name="osd"/>
@@ -234,7 +234,7 @@
     <signal name="draw" handler="popup_draw" swapped="no"/>
     <child>
       <object class="GtkGrid" id="grid2">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="margin_start">12</property>
         <property name="margin_end">12</property>
         <property name="margin_top">12</property>
@@ -243,8 +243,8 @@
         <property name="column_spacing">6</property>
         <child>
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes" context="Color Channel">S</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1" context="Color Channel">S</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -253,8 +253,8 @@
         </child>
         <child>
           <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes" context="Color Channel">V</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1" context="Color Channel">V</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -263,13 +263,13 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="s_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="invisible_char">•</property>
             <property name="climb_rate">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="s_entry-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Saturation</property>
+                <property name="AtkObject::accessible-name" translatable="1">Saturation</property>
               </object>
             </child>
             <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
@@ -281,14 +281,14 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="v_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="invisible_char">•</property>
-            <property name="invisible_char_set">True</property>
+            <property name="invisible_char_set">1</property>
             <property name="climb_rate">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="v_entry-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes">Value</property>
+                <property name="AtkObject::accessible-name" translatable="1">Value</property>
               </object>
             </child>
             <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui
index c16bbdf2e7..90ae27b386 100644
--- a/gtk/ui/gtkcombobox.ui
+++ b/gtk/ui/gtkcombobox.ui
@@ -4,18 +4,17 @@
   <template class="GtkComboBox" parent="GtkBin">
     <child>
       <object class="GtkToggleButton" id="button">
-        <property name="visible">True</property>
-        <property name="focus-on-click">True</property>
+        <property name="visible">1</property>
         <signal name="toggled" handler="gtk_combo_box_button_toggled" swapped="no"/>
         <style>
           <class name="the-button-in-the-combobox"/>
         </style>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <child>
               <object class="GtkImage" id="arrow">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">pan-down-symbolic</property>
               </object>
               <packing>
diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
index 33cf24e36b..b10d58d05f 100644
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -7,29 +7,28 @@
     <signal name="delete-event" handler="gtk_dialog_delete_event_handler" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
-        <property name="visible">True</property>
-        <property name="show-close-button">True</property>
+        <property name="visible">1</property>
+        <property name="show-close-button">1</property>
       </object>
     </child>
     <child>
       <object class="GtkBox" id="vbox">
-        <property name="visible">True</property>
-        <property name="border_width">0</property>
+        <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <style>
           <class name="dialog-vbox"/>
         </style>
         <child>
           <object class="GtkBox" id="action_box">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <style>
               <class name="dialog-action-box"/>
             </style>
             <child>
               <object class="GtkButtonBox" id="action_area">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="layout_style">end</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <style>
                   <class name="dialog-action-area"/>
                 </style>
diff --git a/gtk/ui/gtkfilechooserbutton.ui b/gtk/ui/gtkfilechooserbutton.ui
index bb4cd88e47..5003fc6bdb 100644
--- a/gtk/ui/gtkfilechooserbutton.ui
+++ b/gtk/ui/gtkfilechooserbutton.ui
@@ -4,57 +4,57 @@
   <template class="GtkFileChooserButton" parent="GtkBox">
     <child>
       <object class="GtkButton" id="button">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="visible">1</property>
+        <property name="can_focus">1</property>
+        <property name="receives_default">1</property>
         <signal name="clicked" handler="button_clicked_cb" swapped="no"/>
         <child>
           <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="spacing">4</property>
             <child>
               <object class="GtkImage" id="image">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon_name">image-missing</property>
               </object>
               <packing>
-                <property name="fill">False</property>
+                <property name="fill">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">start</property>
                 <property name="valign">baseline</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">(None)</property>
+                <property name="label" translatable="1">(None)</property>
                 <property name="ellipsize">end</property>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">1</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkSeparator" id="separator1">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="orientation">vertical</property>
               </object>
               <packing>
-                <property name="fill">False</property>
+                <property name="fill">0</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkImage" id="open_file_icon">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon_name">document-open-symbolic</property>
                 <property name="icon_size">1</property>
-                <property name="use_fallback">True</property>
+                <property name="use_fallback">1</property>
                 <property name="valign">baseline</property>
               </object>
               <packing>
-                <property name="fill">False</property>
+                <property name="fill">0</property>
                 <property name="position">3</property>
               </packing>
             </child>
@@ -62,12 +62,12 @@
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkComboBox" id="combo_box">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <signal name="changed" handler="combo_box_changed_cb" swapped="no"/>
         <signal name="notify::popup-shown" handler="combo_box_notify_popup_shown_cb" swapped="no"/>
         <child>
@@ -84,7 +84,7 @@
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
         <property name="position">1</property>
       </packing>
     </child>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index 68056a6996..aac199b502 100644
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -9,7 +9,6 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
-        <property name="border_width">0</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="border_width">6</property>
@@ -21,7 +20,7 @@
         </child>
         <child>
           <object class="GtkFileChooserWidget" id="widget">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="orientation">vertical</property>
             <signal name="default-size-changed" handler="file_chooser_widget_default_size_changed" swapped="no"/>
             <signal name="file-activated" handler="file_chooser_widget_file_activated" swapped="no"/>
@@ -29,7 +28,7 @@
             <signal name="selection-changed" handler="file_chooser_widget_selection_changed" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index c7994e8863..c45a6dce35 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -6,18 +6,17 @@
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkBox" id="browse_widgets_box">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkPaned" id="browse_widgets_hpaned">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <child>
               <object class="GtkPlacesSidebar" id="places_sidebar">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="hscrollbar_policy">never</property>
-                <property name="local_only">True</property>
-                <property name="show_other_locations">True</property>
+                <property name="local_only">1</property>
+                <property name="show_other_locations">1</property>
                 <style>
                   <class name="sidebar"/>
                 </style>
@@ -26,21 +25,21 @@
                 <signal name="show-other-locations" handler="places_sidebar_show_other_locations_cb" swapped="no"/>
               </object>
               <packing>
-                <property name="resize">False</property>
-                <property name="shrink">False</property>
+                <property name="resize">0</property>
+                <property name="shrink">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkRevealer" id="browse_header_revealer">
-                    <property name="visible">True</property>
-                    <property name="hexpand">True</property>
+                    <property name="visible">1</property>
+                    <property name="hexpand">1</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">12</property>
                         <style>
@@ -48,11 +47,11 @@
                         </style>
                         <child>
                           <object class="GtkStack" id="browse_header_stack">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="transition-type">crossfade</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="spacing">6</property>
                                 <property name="border_width">6</property>
                                 <child>
@@ -61,25 +60,25 @@
                                     <signal name="path-clicked" handler="path_bar_clicked" after="yes" swapped="no"/>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkMenuButton" id="browse_new_folder_button">
-                                    <property name="tooltip-text" translatable="yes">Create Folder</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="tooltip-text" translatable="1">Create Folder</property>
+                                    <property name="use_underline">1</property>
                                     <property name="popover">new_folder_popover</property>
                                     <signal name="notify::active" handler="new_folder_popover_active"/>
                                     <child>
                                       <object class="GtkImage">
-                                        <property name="visible">True</property>
+                                        <property name="visible">1</property>
                                         <property name="icon-name">folder-new-symbolic</property>
                                         <property name="icon-size">1</property>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="fill">False</property>
+                                    <property name="fill">0</property>
                                     <property name="pack_type">end</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -91,8 +90,8 @@
                             </child>
                             <child>
                               <object class="GtkBox" id="location_entry_box">
-                                <property name="visible">True</property>
-                                <property name="no-show-all">True</property>
+                                <property name="visible">1</property>
+                                <property name="no-show-all">1</property>
                                 <property name="spacing">6</property>
                                 <property name="border_width">6</property>
                               </object>
@@ -102,13 +101,13 @@
                             </child>
                             <child>
                               <object class="GtkBox" id="search_entry_box">
-                                <property name="visible">True</property>
-                                <property name="no-show-all">True</property>
+                                <property name="visible">1</property>
+                                <property name="no-show-all">1</property>
                                 <property name="spacing">6</property>
                                 <property name="border_width">6</property>
                                 <child type="center">
                                   <object class="GtkSearchEntry" id="search_entry">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="width-chars">45</property>
                                     <signal name="search-changed" handler="search_entry_activate_cb" swapped="yes"/>
                                     <signal name="stop-search" handler="search_entry_stop_cb" swapped="yes"/>
@@ -116,8 +115,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkSpinner" id="search_spinner">
-                                    <property name="visible">False</property>
-                                    <property name="active">True</property>
+                                    <property name="active">1</property>
                                   </object>
                                   <packing>
                                     <property name="pack-type">end</property>
@@ -130,43 +128,43 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="fill">False</property>
+                            <property name="fill">0</property>
                           </packing>
                         </child>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="fill">False</property>
+                    <property name="fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="list_and_preview_box">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkStack" id="browse_files_stack">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="transition-type">crossfade</property>
                         <style>
                           <class name="view"/>
                         </style>
                         <child>
                           <object class="GtkBox">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkScrolledWindow" id="browse_files_swin">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="hscrollbar_policy">never</property>
                                 <child>
                                   <object class="GtkTreeView" id="browse_files_tree_view">
-                                    <property name="visible">True</property>
-                                    <property name="has_tooltip">True</property>
-                                    <property name="enable-search">False</property>
+                                    <property name="visible">1</property>
+                                    <property name="has_tooltip">1</property>
+                                    <property name="enable-search">0</property>
                                     <child internal-child="accessible">
                                       <object class="AtkObject" id="browse_files_tree_view-atkobject">
-                                        <property name="AtkObject::accessible-name" translatable="yes">Files</property>
+                                        <property name="AtkObject::accessible-name" translatable="1">Files</property>
                                       </object>
                                     </child>
                                     <signal name="button-press-event" handler="list_button_press_event_cb" swapped="no"/>
@@ -187,9 +185,9 @@
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="list_name_column">
-                                        <property name="title" translatable="yes">Name</property>
-                                        <property name="resizable">True</property>
-                                        <property name="expand">True</property>
+                                        <property name="title" translatable="1">Name</property>
+                                        <property name="resizable">1</property>
+                                        <property name="expand">1</property>
                                         <child>
                                           <object class="GtkCellRendererPixbuf" id="list_pixbuf_renderer">
                                             <property name="xpad">6</property>
@@ -205,10 +203,10 @@
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="list_location_column">
-                                        <property name="title" translatable="yes">Location</property>
-                                        <property name="resizable">True</property>
-                                        <property name="visible">False</property>
-                                        <property name="expand">True</property>
+                                        <property name="title" translatable="1">Location</property>
+                                        <property name="resizable">1</property>
+                                        <property name="visible">0</property>
+                                        <property name="expand">1</property>
                                         <child>
                                           <object class="GtkCellRendererText" id="list_location_renderer">
                                             <property name="xalign">0</property>
@@ -221,7 +219,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="list_size_column">
-                                        <property name="title" translatable="yes">Size</property>
+                                        <property name="title" translatable="1">Size</property>
                                         <property name="sizing">fixed</property>
                                         <child>
                                           <object class="GtkCellRendererText" id="list_size_renderer">
@@ -233,7 +231,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="list_time_column">
-                                        <property name="title" translatable="yes">Modified</property>
+                                        <property name="title" translatable="1">Modified</property>
                                         <property name="sizing">fixed</property>
                                         <child>
                                           <object class="GtkCellRendererText" id="list_date_renderer">
@@ -251,15 +249,15 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkActionBar" id="remote_warning_bar">
                                 <child type="center">
                                   <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Remote location — only searching the current folder</property>
+                                    <property name="visible">1</property>
+                                    <property name="label" translatable="1">Remote location — only searching the current folder</property>
                                   </object>
                                 </child>
                               </object>
@@ -282,10 +280,10 @@
                         </child>
                         <child>
                           <object class="GtkGrid">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="row_spacing">12</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
+                            <property name="hexpand">1</property>
+                            <property name="vexpand">1</property>
                             <property name="halign">center</property>
                             <property name="valign">center</property>
                             <style>
@@ -293,7 +291,7 @@
                             </style>
                             <child>
                               <object class="GtkImage">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="icon-name">edit-find-symbolic</property>
                                 <property name="pixel-size">72</property>
                                 <style>
@@ -307,8 +305,8 @@
                             </child>
                             <child>
                               <object class="GtkLabel">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">No Results Found</property>
+                                <property name="visible">1</property>
+                                <property name="label" translatable="1">No Results Found</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                   <attribute name="scale" value="1.44"/>
@@ -321,8 +319,8 @@
                             </child>
                             <child>
                               <object class="GtkLabel">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Try a different search</property>
+                                <property name="visible">1</property>
+                                <property name="label" translatable="1">Try a different search</property>
                                 <style>
                                   <class name="dim-label"/>
                                 </style>
@@ -339,7 +337,7 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">1</property>
                       </packing>
                     </child>
                     <child>
@@ -348,57 +346,57 @@
                         <property name="spacing">12</property>
                       </object>
                       <packing>
-                        <property name="fill">False</property>
+                        <property name="fill">0</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
+                    <property name="expand">1</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="shrink">False</property>
+                <property name="shrink">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkActionBar" id="extra_and_filters">
-        <property name="no-show-all">True</property>
+        <property name="no-show-all">1</property>
         <child>
           <object class="GtkBox" id="extra_align">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="spacing">12</property>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="filter_combo_hbox">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkComboBoxText" id="filter_combo">
-                <property name="visible">True</property>
-                <property name="tooltip_text" translatable="yes">Select which types of files are shown</property>
-                <property name="focus_on_click">False</property>
+                <property name="visible">1</property>
+                <property name="tooltip_text" translatable="1">Select which types of files are shown</property>
+                <property name="focus_on_click">0</property>
                 <property name="entry_text_column">0</property>
                 <property name="id_column">1</property>
                 <property name="valign">start</property>
                 <signal name="changed" handler="filter_combo_changed" swapped="no"/>
               </object>
               <packing>
-                <property name="fill">False</property>
+                <property name="fill">0</property>
                 <property name="pack_type">end</property>
               </packing>
             </child>
@@ -424,14 +422,14 @@
   <object class="GtkPopover" id="new_folder_popover">
     <child>
       <object class="GtkGrid">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="margin">10</property>
         <property name="column-spacing">6</property>
         <property name="row-spacing">6</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Folder Name</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1">Folder Name</property>
             <property name="halign">start</property>
             <property name="mnemonic_widget">new_folder_name_entry</property>
             <attributes>
@@ -444,9 +442,9 @@
         </child>
         <child>
           <object class="GtkEntry" id="new_folder_name_entry">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="width-chars">25</property>
-            <property name="activates_default">True</property>
+            <property name="activates_default">1</property>
             <signal name="changed" handler="new_folder_name_changed"/>
           </object>
           <packing>
@@ -456,11 +454,11 @@
         </child>
         <child>
           <object class="GtkButton" id="new_folder_create_button">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="label" translatable="yes">_Create</property>
-            <property name="use_underline">True</property>
-            <property name="can_default">True</property>
+            <property name="visible">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="1">_Create</property>
+            <property name="use_underline">1</property>
+            <property name="can_default">1</property>
             <signal name="clicked" handler="new_folder_create_clicked"/>
             <style>
               <class name="suggested-action"/>
@@ -473,7 +471,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="new_folder_error_label">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="halign">start</property>
           </object>
           <packing>
@@ -490,14 +488,14 @@
     <signal name="closed" handler="rename_file_end"/>
     <child>
       <object class="GtkGrid">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="margin">10</property>
         <property name="row-spacing">6</property>
         <property name="column-spacing">6</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Name</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1">Name</property>
             <property name="halign">start</property>
             <property name="mnemonic_widget">rename_file_name_entry</property>
             <attributes>
@@ -510,8 +508,8 @@
         </child>
         <child>
           <object class="GtkEntry" id="rename_file_name_entry">
-            <property name="visible">True</property>
-            <property name="activates-default">True</property>
+            <property name="visible">1</property>
+            <property name="activates-default">1</property>
             <signal name="changed" handler="rename_file_name_changed"/>
           </object>
           <packing>
@@ -521,11 +519,11 @@
         </child>
         <child>
           <object class="GtkButton" id="rename_file_rename_button">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="label" translatable="yes">_Rename</property>
-            <property name="use_underline">True</property>
-            <property name="can_default">True</property>
+            <property name="visible">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="1">_Rename</property>
+            <property name="use_underline">1</property>
+            <property name="can_default">1</property>
             <signal name="clicked" handler="rename_file_rename_clicked"/>
             <style>
               <class name="suggested-action"/>
@@ -538,7 +536,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="rename_file_error_label">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="halign">start</property>
           </object>
           <packing>
diff --git a/gtk/ui/gtkfontbutton.ui b/gtk/ui/gtkfontbutton.ui
index 54aa64e066..2f3f35f2e6 100644
--- a/gtk/ui/gtkfontbutton.ui
+++ b/gtk/ui/gtkfontbutton.ui
@@ -2,41 +2,41 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkFontButton" parent="GtkButton">
-    <property name="can_focus">True</property>
-    <property name="receives_default">True</property>
+    <property name="can_focus">1</property>
+    <property name="receives_default">1</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <child>
           <object class="GtkLabel" id="font_label">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Font</property>
+            <property name="visible">1</property>
+            <property name="label" translatable="1">Font</property>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">1</property>
             <property name="padding">5</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="font_size_box">
-            <property name="visible">True</property>
-            <property name="no_show_all">True</property>
+            <property name="visible">1</property>
+            <property name="no_show_all">1</property>
             <child>
               <object class="GtkSeparator" id="separator">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="orientation">vertical</property>
               </object>
               <packing>
-                <property name="fill">False</property>
+                <property name="fill">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="size_label">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="label">14</property>
               </object>
               <packing>
-                <property name="fill">False</property>
+                <property name="fill">0</property>
                 <property name="padding">5</property>
                 <property name="position">1</property>
               </packing>
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
index f220b194cf..7ac9328c13 100644
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -3,7 +3,7 @@
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkFontChooserDialog" parent="GtkDialog">
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Select Font</property>
+    <property name="title" translatable="1">Select Font</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -11,14 +11,14 @@
         <property name="spacing">2</property>
         <child>
           <object class="GtkFontChooserWidget" id="fontchooser">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="border_width">5</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <signal name="font-activated" handler="font_activated_cb" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -26,17 +26,17 @@
     </child>
     <child type="action">
       <object class="GtkButton" id="cancel_button">
-        <property name="visible">True</property>
-        <property name="use_underline">True</property>
-        <property name="label" translatable="yes">_Cancel</property>
+        <property name="visible">1</property>
+        <property name="use_underline">1</property>
+        <property name="label" translatable="1">_Cancel</property>
       </object>
     </child>
     <child type="action">
       <object class="GtkButton" id="ok_button">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Select</property>
-        <property name="use_underline">True</property>
-        <property name="can_default">True</property>
+        <property name="visible">1</property>
+        <property name="label" translatable="1">_Select</property>
+        <property name="use_underline">1</property>
+        <property name="can_default">1</property>
       </object>
     </child>
     <action-widgets>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 61b8a8c6f1..4feb9ca429 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -33,21 +33,21 @@
   <template class="GtkFontChooserWidget" parent="GtkBox">
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="row_spacing">6</property>
         <property name="column_spacing">6</property>
         <child>
           <object class="GtkSearchEntry" id="search_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-            <property name="activates_default">true</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="hexpand">1</property>
+            <property name="activates_default">1</property>
             <property name="primary_icon_name">edit-find-symbolic</property>
-            <property name="primary_icon_activatable">False</property>
-            <property name="secondary_icon_activatable">False</property>
-            <property name="primary_icon_sensitive">False</property>
-            <property name="secondary_icon_sensitive">False</property>
-            <property name="placeholder_text" translatable="yes">Search font name</property>
+            <property name="primary_icon_activatable">0</property>
+            <property name="secondary_icon_activatable">0</property>
+            <property name="primary_icon_sensitive">0</property>
+            <property name="secondary_icon_sensitive">0</property>
+            <property name="placeholder_text" translatable="1">Search font name</property>
             <signal name="search-changed" handler="text_changed_cb" swapped="no"/>
             <signal name="stop-search" handler="stop_search_cb" swapped="no"/>
           </object>
@@ -59,30 +59,30 @@
         </child>
         <child>
           <object class="GtkStack" id="list_stack">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <child>
               <object class="GtkGrid">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">6</property>
                 <child>
                   <object class="GtkScrolledWindow" id="list_scrolled_window">
                     <property name="width_request">400</property>
                     <property name="height_request">300</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="hexpand">1</property>
+                    <property name="vexpand">1</property>
                     <property name="hscrollbar_policy">never</property>
                     <property name="shadow_type">etched-in</property>
                     <child>
                       <object class="GtkTreeView" id="family_face_list">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <property name="model">filter_model</property>
-                        <property name="headers_visible">False</property>
-                        <property name="enable_search">False</property>
-                        <property name="fixed_height_mode">True</property>
+                        <property name="headers_visible">0</property>
+                        <property name="enable_search">0</property>
+                        <property name="fixed_height_mode">1</property>
                         <signal name="cursor-changed" handler="cursor_changed_cb" swapped="no"/>
                         <signal name="row-activated" handler="row_activated_cb" swapped="no"/>
                         <signal name="style-updated" handler="gtk_font_chooser_widget_set_cell_size" object="GtkFontChooserWidget" after="yes" swapped="yes"/>
@@ -94,7 +94,7 @@
                         <child>
                           <object class="GtkTreeViewColumn" id="family_face_column">
                             <property name="sizing">fixed</property>
-                            <property name="title" translatable="yes">Font Family</property>
+                            <property name="title" translatable="1">Font Family</property>
                             <child>
                               <object class="GtkCellRendererText" id="family_face_cell">
                                 <property name="ellipsize">end</property>
@@ -113,11 +113,10 @@
                 </child>
                 <child>
                   <object class="GtkEntry" id="preview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
                     <property name="invisible_char">•</property>
-                    <property name="text"></property>
-                    <property name="placeholder-text" translatable="yes">Preview text</property>
+                    <property name="placeholder-text" translatable="1">Preview text</property>
                     <signal name="scroll-event" handler="resize_by_scroll_cb" swapped="no"/>
                   </object>
                   <packing>
@@ -128,11 +127,11 @@
                 </child>
                 <child>
                   <object class="GtkScale" id="size_slider">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="hexpand">1</property>
                     <property name="adjustment">slider_adjustment</property>
-                    <property name="draw_value">False</property>
+                    <property name="draw_value">0</property>
                     <property name="round-digits">0</property>
                     <signal name="scroll-event" handler="resize_by_scroll_cb" swapped="no"/>
                   </object>
@@ -143,8 +142,8 @@
                 </child>
                 <child>
                   <object class="GtkSpinButton" id="size_spin">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">spin_adjustment</property>
                     <signal name="output" handler="output_cb"/>
@@ -161,10 +160,10 @@
             </child>
             <child>
               <object class="GtkGrid">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="row_spacing">12</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <style>
@@ -172,7 +171,7 @@
                 </style>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="gicon">fonticon</property>
                     <property name="pixel-size">64</property>
                   </object>
@@ -183,8 +182,8 @@
                 </child>
                 <child>
                   <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">No Fonts Found</property>
+                    <property name="visible">1</property>
+                    <property name="label" translatable="1">No Fonts Found</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                       <attribute name="scale" value="1.2"/>
@@ -209,7 +208,7 @@
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
       </packing>
     </child>
   </template>
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
index b9fc0ebebe..3fc1bf5038 100644
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -2,27 +2,27 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkInfoBar" parent="GtkBox">
-    <property name="app_paintable">True</property>
+    <property name="app_paintable">1</property>
     <child>
       <object class="GtkRevealer" id="revealer">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <child>
           <object class="GtkBox" id="content">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <child>
               <object class="GtkBox" id="content_area">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="border_width">8</property>
                 <property name="spacing">16</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkButtonBox" id="action_area">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="border_width">6</property>
                 <property name="spacing">6</property>
                 <property name="layout_style">end</property>
@@ -33,7 +33,7 @@
             </child>
             <child>
               <object class="GtkButton" id="close_button">
-                <property name="can_focus">True</property>
+                <property name="can_focus">1</property>
                 <property name="border_width">6</property>
                 <property name="relief">none</property>
                 <property name="valign">center</property>
@@ -43,7 +43,7 @@
                 </style>
                 <child>
                   <object class="GtkImage" id="close_image">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="icon_name">window-close-symbolic</property>
                   </object>
                 </child>
diff --git a/gtk/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui
index 25a605314f..4ff78d52cc 100644
--- a/gtk/ui/gtklockbutton.ui
+++ b/gtk/ui/gtklockbutton.ui
@@ -2,44 +2,44 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.6 -->
   <template class="GtkLockButton" parent="GtkButton">
-    <property name="visible">True</property>
-    <property name="can_focus">True</property>
-    <property name="receives_default">True</property>
+    <property name="visible">1</property>
+    <property name="can_focus">1</property>
+    <property name="receives_default">1</property>
     <child>
       <object class="GtkBox" id="box">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="halign">center</property>
         <property name="valign">center</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkImage" id="image">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="icon_name">image-missing</property>
           </object>
           <packing>
-            <property name="fill">False</property>
+            <property name="fill">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_lock">
-            <property name="visible">True</property>
-            <property name="no_show_all">True</property>
+            <property name="visible">1</property>
+            <property name="no_show_all">1</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Lock</property>
+            <property name="label" translatable="1">Lock</property>
           </object>
           <packing>
-            <property name="fill">False</property>
+            <property name="fill">0</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_unlock">
-            <property name="no_show_all">True</property>
+            <property name="no_show_all">1</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Unlock</property>
+            <property name="label" translatable="1">Unlock</property>
           </object>
           <packing>
-            <property name="fill">False</property>
+            <property name="fill">0</property>
             <property name="position">2</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index 7439aa1fb0..4d8df617df 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -3,70 +3,69 @@
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkMessageDialog" parent="GtkDialog">
     <property name="title"> </property>
-    <property name="resizable">False</property>
+    <property name="resizable">0</property>
     <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_taskbar_hint">1</property>
     <style>
       <class name="message-dialog"/>
     </style>
     <child internal-child="headerbar">
       <object class="GtkHeaderBar" id="headerbar1">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
       </object>
     </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
-        <property name="border_width">0</property>
         <property name="spacing">20</property>
         <child>
           <object class="GtkBox" id="box">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="margin_start">30</property>
             <property name="margin_end">30</property>
             <property name="spacing">30</property>
             <child>
               <object class="GtkBox" id="message_area">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">10</property>
                 <child>
                   <object class="GtkLabel" id="label">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
-                    <property name="wrap">True</property>
-                    <property name="selectable">True</property>
+                    <property name="wrap">1</property>
+                    <property name="selectable">1</property>
                     <property name="max-width-chars">60</property>
                   </object>
                   <packing>
-                    <property name="fill">False</property>
+                    <property name="fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="secondary_label">
-                    <property name="no_show_all">True</property>
+                    <property name="no_show_all">1</property>
                     <property name="margin-bottom">2</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
-                    <property name="wrap">True</property>
-                    <property name="selectable">True</property>
+                    <property name="wrap">1</property>
+                    <property name="selectable">1</property>
                     <property name="max-width-chars">60</property>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
+                    <property name="expand">1</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">1</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="fill">False</property>
+            <property name="fill">0</property>
           </packing>
         </child>
       </object>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 08a41f156c..50af3f8aa9 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -28,24 +28,24 @@
     <property name="border_width">5</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
-    <property name="title" translatable="yes">Page Setup</property>
+    <property name="title" translatable="1">Page Setup</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="border_width">5</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel" id="printer_combo_label">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">start</property>
                 <property name="valign">center</property>
-                <property name="label" translatable="yes">_Format for:</property>
-                <property name="use_underline">True</property>
+                <property name="label" translatable="1">_Format for:</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">printer_combo</property>
               </object>
               <packing>
@@ -55,8 +55,8 @@
             </child>
             <child>
               <object class="GtkComboBox" id="printer_combo">
-                <property name="visible">True</property>
-                <property name="hexpand">True</property>
+                <property name="visible">1</property>
+                <property name="hexpand">1</property>
                 <property name="model">printer_list</property>
                 <signal name="changed" handler="printer_changed_callback" swapped="no"/>
                 <child>
@@ -74,11 +74,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="paper_size_combo_label">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">start</property>
                 <property name="valign">center</property>
-                <property name="label" translatable="yes">_Paper size:</property>
-                <property name="use_underline">True</property>
+                <property name="label" translatable="1">_Paper size:</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">paper_size_combo</property>
               </object>
               <packing>
@@ -88,8 +88,8 @@
             </child>
             <child>
               <object class="GtkComboBox" id="paper_size_combo">
-                <property name="visible">True</property>
-                <property name="hexpand">True</property>
+                <property name="visible">1</property>
+                <property name="hexpand">1</property>
                 <property name="model">page_setup_list</property>
                 <signal name="changed" handler="paper_size_changed" swapped="no"/>
                 <child>
@@ -104,7 +104,7 @@
             </child>
             <child>
               <object class="GtkLabel" id="paper_size_label">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">start</property>
                 <property name="valign">center</property>
               </object>
@@ -116,11 +116,11 @@
             </child>
             <child>
               <object class="GtkLabel" id="orientation_label">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">start</property>
                 <property name="valign">center</property>
-                <property name="label" translatable="yes">_Orientation:</property>
-                <property name="use_underline">True</property>
+                <property name="label" translatable="1">_Orientation:</property>
+                <property name="use_underline">1</property>
                 <property name="mnemonic_widget">portrait_radio</property>
               </object>
               <packing>
@@ -130,26 +130,26 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="portrait_radio">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
+                <property name="active">1</property>
+                <property name="draw_indicator">1</property>
                 <child>
                   <object class="GtkBox" id="box1">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="image1">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="icon_name">gtk-orientation-portrait</property>
                         <property name="icon_size">3</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Portrait</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">Portrait</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -165,27 +165,27 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="reverse_portrait_radio">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
+                <property name="active">1</property>
+                <property name="draw_indicator">1</property>
                 <property name="group">portrait_radio</property>
                 <child>
                   <object class="GtkBox" id="box2">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="image2">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="icon_name">gtk-orientation-reverse-portrait</property>
                         <property name="icon_size">3</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Reverse portrait</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">Reverse portrait</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -201,27 +201,27 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="landscape_radio">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
+                <property name="active">1</property>
+                <property name="draw_indicator">1</property>
                 <property name="group">portrait_radio</property>
                 <child>
                   <object class="GtkBox" id="box3">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="image3">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="icon_name">gtk-orientation-landscape</property>
                         <property name="icon_size">3</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Landscape</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">Landscape</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -237,26 +237,26 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="reverse_landscape_radio">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
+                <property name="draw_indicator">1</property>
                 <property name="group">portrait_radio</property>
                 <child>
                   <object class="GtkBox" id="box4">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkImage" id="image4">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="icon_name">gtk-orientation-reverse-landscape</property>
                         <property name="icon_size">3</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Reverse landscape</property>
+                        <property name="visible">1</property>
+                        <property name="label" translatable="1">Reverse landscape</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -272,7 +272,7 @@
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">1</property>
           </packing>
         </child>
       </object>
diff --git a/gtk/ui/gtkpathbar.ui b/gtk/ui/gtkpathbar.ui
index c41ed7fd7f..15eef68318 100644
--- a/gtk/ui/gtkpathbar.ui
+++ b/gtk/ui/gtkpathbar.ui
@@ -2,13 +2,13 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkButton" id="down_slider_button">
-    <property name="visible">True</property>
-    <property name="can_focus">True</property>
-    <property name="receives_default">True</property>
-    <property name="focus_on_click">False</property>
+    <property name="visible">1</property>
+    <property name="can_focus">1</property>
+    <property name="receives_default">1</property>
+    <property name="focus_on_click">0</property>
     <child internal-child="accessible">
       <object class="AtkObject" id="down_slider_button-atkobject">
-        <property name="AtkObject::accessible-name" translatable="yes">Down Path</property>
+        <property name="AtkObject::accessible-name" translatable="1">Down Path</property>
       </object>
     </child>
     <signal name="button-press-event" handler="gtk_path_bar_slider_button_press" swapped="no"/>
@@ -17,7 +17,7 @@
     <signal name="unmap" handler="on_slider_unmap" swapped="no"/>
     <child>
       <object class="GtkImage">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="icon-name">pan-end-symbolic</property>
         <property name="icon-size">1</property>
       </object>
@@ -27,13 +27,13 @@
     </style>
   </object>
   <object class="GtkButton" id="up_slider_button">
-    <property name="visible">True</property>
-    <property name="can_focus">True</property>
-    <property name="receives_default">True</property>
-    <property name="focus_on_click">False</property>
+    <property name="visible">1</property>
+    <property name="can_focus">1</property>
+    <property name="receives_default">1</property>
+    <property name="focus_on_click">0</property>
     <child internal-child="accessible">
       <object class="AtkObject" id="up_slider_button-atkobject">
-        <property name="AtkObject::accessible-name" translatable="yes">Up Path</property>
+        <property name="AtkObject::accessible-name" translatable="1">Up Path</property>
       </object>
     </child>
     <signal name="button-press-event" handler="gtk_path_bar_slider_button_press" swapped="no"/>
@@ -42,7 +42,7 @@
     <signal name="unmap" handler="on_slider_unmap" swapped="no"/>
     <child>
       <object class="GtkImage">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="icon-name">pan-start-symbolic</property>
         <property name="icon-size">1</property>
       </object>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 5ee523e921..811566f7a6 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk30">
   <requires lib="gtk+" version="3.16"/>
-    <object class="GtkListStore" id="completion_store">
+  <object class="GtkListStore" id="completion_store">
     <columns>
       <!-- column-name name -->
       <column type="gchararray"/>
@@ -11,51 +11,40 @@
   </object>
   <object class="GtkEntryCompletion" id="address_entry_completion">
     <property name="model">completion_store</property>
-    <property name="minimum_key_length">1</property>
     <property name="text_column">1</property>
-    <property name="inline_completion">True</property>
-    <property name="popup_completion">False</property>
+    <property name="inline_completion">1</property>
+    <property name="popup_completion">0</property>
   </object>
   <object class="GtkPopover" id="recent_servers_popover">
     <child>
       <object class="GtkStack" id="recent_servers_stack">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="vexpand">True</property>
+            <property name="visible">1</property>
+            <property name="vexpand">1</property>
             <property name="valign">center</property>
             <property name="orientation">vertical</property>
             <property name="spacing">18</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="pixel-size">48</property>
                 <property name="icon_name">network-server-symbolic</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" comments="Translators: Server as any successfully connected network address">No recent servers found</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1" comments="Translators: Server as any successfully connected network address">No recent servers found</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -66,52 +55,43 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="border_width">12</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Recent Servers</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">Recent Servers</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkScrolledWindow">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="vexpand">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="vexpand">1</property>
                 <property name="shadow_type">in</property>
                 <property name="min_content_width">250</property>
                 <property name="min_content_height">150</property>
                 <child>
                   <object class="GtkViewport">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="visible">1</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkListBox" id="recent_servers_listbox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <property name="selection_mode">none</property>
-                        <signal name="row-activated" handler="on_recent_servers_listbox_row_activated" object="GtkPlacesView" swapped="yes" />
+                        <signal name="row-activated" handler="on_recent_servers_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -127,35 +107,31 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
-    <signal name="key-press-event" handler="on_key_press_event" object="GtkPlacesView" swapped="no" />
+    <signal name="key-press-event" handler="on_key_press_event" object="GtkPlacesView" swapped="no"/>
     <child>
       <object class="GtkStack" id="stack">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="vhomogeneous">False</property>
+        <property name="visible">1</property>
+        <property name="vhomogeneous">0</property>
         <property name="transition_type">crossfade</property>
         <child>
           <object class="GtkFrame">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
+            <property name="visible">1</property>
             <property name="shadow_type">none</property>
             <child>
               <object class="GtkScrolledWindow">
-                <property name="visible">True</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="visible">1</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <child>
                   <object class="GtkViewport">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="visible">1</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkListBox" id="listbox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
                         <property name="selection_mode">none</property>
-                        <signal name="row-activated" handler="on_listbox_row_activated" object="GtkPlacesView" swapped="yes" />
+                        <signal name="row-activated" handler="on_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
                       </object>
                     </child>
                     <style>
@@ -172,58 +148,45 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="visible">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="pixel_size">72</property>
                 <property name="icon_name">edit-find-symbolic</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">No results found</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">No results found</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                   <attribute name="scale" value="1.44"/>
                 </attributes>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Try a different search</property>
+                <property name="visible">1</property>
+                <property name="label" translatable="1">Try a different search</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -241,18 +204,16 @@
     </child>
     <child>
       <object class="GtkActionBar" id="actionbar">
-        <property name="visible">True</property>
-        <property name="hexpand">True</property>
-        <property name="can_focus">False</property>
+        <property name="visible">1</property>
+        <property name="hexpand">1</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="hexpand">True</property>
-            <property name="can_focus">False</property>
+            <property name="visible">1</property>
+            <property name="hexpand">1</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Connect to _Server</property>
+            <property name="label" translatable="1">Connect to _Server</property>
             <property name="mnemonic_widget">address_entry</property>
-            <property name="use_underline">True</property>
+            <property name="use_underline">1</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -260,13 +221,13 @@
         </child>
         <child>
           <object class="GtkButton" id="connect_button">
-            <property name="label" translatable="yes">Con_nect</property>
-            <property name="use_underline">True</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="sensitive">False</property>
-            <property name="receives_default">True</property>
-            <signal name="clicked" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes" />
+            <property name="label" translatable="1">Con_nect</property>
+            <property name="use_underline">1</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="sensitive">0</property>
+            <property name="receives_default">1</property>
+            <signal name="clicked" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes"/>
           </object>
           <packing>
             <property name="pack_type">end</property>
@@ -274,44 +235,34 @@
         </child>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="hexpand">True</property>
-            <property name="can_focus">False</property>
+            <property name="visible">1</property>
+            <property name="hexpand">1</property>
             <child>
               <object class="GtkEntry" id="address_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="hexpand">1</property>
                 <property name="width_chars">20</property>
-                <property name="placeholder_text" translatable="yes">Enter server address…</property>
+                <property name="placeholder_text" translatable="1">Enter server address…</property>
                 <property name="completion">address_entry_completion</property>
-                <signal name="notify::text" handler="on_address_entry_text_changed" object="GtkPlacesView" swapped="yes" />
-                <signal name="activate" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes" />
+                <signal name="notify::text" handler="on_address_entry_text_changed" object="GtkPlacesView" swapped="yes"/>
+                <signal name="activate" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes"/>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-              </packing>
             </child>
             <child>
               <object class="GtkMenuButton" id="server_list_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                 <property name="direction">up</property>
                 <property name="popover">recent_servers_popover</property>
                 <child>
                   <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="visible">1</property>
                     <property name="icon_name">pan-up-symbolic</property>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-              </packing>
             </child>
             <style>
               <class name="linked"/>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index d1e923b191..5259f160f7 100644
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -6,50 +6,38 @@
     <property name="visible">True</property>
     <property name="can_focus">True</property>
     <style>
-      <class name="volume-row" />
+      <class name="volume-row"/>
     </style>
     <child>
       <object class="GtkEventBox" id="event_box">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <child>
           <object class="GtkBox" id="box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="visible">1</property>
             <property name="margin_start">12</property>
             <property name="margin_end">12</property>
             <property name="margin_top">6</property>
             <property name="margin_bottom">6</property>
-            <property name="border_width">0</property>
             <property name="spacing">18</property>
             <child>
               <object class="GtkImage" id="icon_image">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="pixel_size">32</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="name_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
+                <property name="visible">1</property>
+                <property name="hexpand">1</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="path_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="visible">1</property>
                 <property name="justify">right</property>
                 <property name="ellipsize">middle</property>
                 <property name="xalign">1</property>
@@ -60,20 +48,17 @@
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="eject_button">
-                <property name="visible">False</property>
                 <property name="halign">end</property>
                 <property name="valign">center</property>
-                <property name="tooltip-text" translatable="yes">Unmount</property>
+                <property name="tooltip-text" translatable="1">Unmount</property>
                 <child>
                   <object class="GtkImage" id="eject_icon">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="icon_name">media-eject-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
@@ -84,20 +69,14 @@
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">3</property>
               </packing>
             </child>
             <child>
               <object class="GtkSpinner" id="busy_spinner">
-                <property name="visible">False</property>
-                <property name="can_focus">False</property>
-                <property name="active">True</property>
+                <property name="active">1</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">4</property>
               </packing>
             </child>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index e619ccccba..272525407b 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -56,7 +56,6 @@
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <property name="border_width">0</property>
         <style>
           <class name="view"/>
         </style>
@@ -67,33 +66,33 @@
         </child>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkNotebook" id="notebook">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="show_border">False</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="show_border">0</property>
                 <child>
                   <object class="GtkBox" id="general_main_box">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="border_width">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
                     <child>
                       <object class="GtkBox" id="box2">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkScrolledWindow" id="printer_swin">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="visible">1</property>
+                            <property name="can_focus">1</property>
                             <property name="shadow_type">in</property>
                             <child>
                               <object class="GtkTreeView" id="printer_treeview">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
                                 <property name="model">printer_list_filter</property>
                                 <signal name="row-activated" handler="emit_ok_response" swapped="no"/>
                                 <child internal-child="selection">
@@ -114,7 +113,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkTreeViewColumn" id="printer_name_column">
-                                    <property name="title" translatable="yes">Printer</property>
+                                    <property name="title" translatable="1">Printer</property>
                                     <child>
                                       <object class="GtkCellRendererText" id="printer_name_renderer"/>
                                       <attributes>
@@ -125,7 +124,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkTreeViewColumn" id="printer_location_column">
-                                    <property name="title" translatable="yes" comments="this is the header for the location column in the print dialog">Location</property>
+                                    <property name="title" translatable="1" comments="this is the header for the location column in the print dialog">Location</property>
                                     <child>
                                       <object class="GtkCellRendererText" id="printer_location_renderer"/>
                                       <attributes>
@@ -136,7 +135,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkTreeViewColumn" id="printer_status_column">
-                                    <property name="title" translatable="yes" comments="this is the header for the printer status column in the print dialog">Status</property>
+                                    <property name="title" translatable="1" comments="this is the header for the printer status column in the print dialog">Status</property>
                                     <child>
                                       <object class="GtkCellRendererText" id="printer_status_renderer">
                                         <property name="ellipsize">end</property>
@@ -151,39 +150,39 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
+                            <property name="expand">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="extension_point">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="spacing">18</property>
                           </object>
                           <packing>
-                            <property name="fill">False</property>
+                            <property name="fill">0</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="box3">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="spacing">18</property>
                         <child>
                           <object class="GtkBox" id="frame_template1">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="label_widget1">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
-                                <property name="label" translatable="yes">Range</property>
+                                <property name="label" translatable="1">Range</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -192,23 +191,23 @@
                                 </accessibility>
                               </object>
                               <packing>
-                                <property name="fill">False</property>
+                                <property name="fill">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkGrid" id="range_table">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="margin_start">12</property>
                                 <property name="row_spacing">6</property>
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkRadioButton" id="all_pages_radio">
-                                    <property name="label" translatable="yes">_All Pages</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">_All Pages</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="use_underline">1</property>
+                                    <property name="active">1</property>
+                                    <property name="draw_indicator">1</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -218,13 +217,13 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="current_page_radio">
-                                    <property name="label" translatable="yes">C_urrent Page</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">C_urrent Page</property>
+                                    <property name="visible">1</property>
+                                    <property name="sensitive">0</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="use_underline">1</property>
+                                    <property name="active">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <property name="group">all_pages_radio</property>
                                   </object>
                                   <packing>
@@ -235,12 +234,12 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="selection_radio">
-                                    <property name="label" translatable="yes">Se_lection</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">Se_lection</property>
+                                    <property name="sensitive">0</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="use_underline">1</property>
+                                    <property name="active">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <property name="group">all_pages_radio</property>
                                   </object>
                                   <packing>
@@ -251,14 +250,14 @@
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="page_range_radio">
-                                    <property name="label" translatable="yes">Pag_es:</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">Specify one or more page ranges,
+                                    <property name="label" translatable="1">Pag_es:</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="tooltip_text" translatable="1">Specify one or more page ranges,
  e.g. 1–3, 7, 11</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="use_underline">1</property>
+                                    <property name="active">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <property name="group">all_pages_radio</property>
                                     <signal name="toggled" handler="update_page_range_entry_sensitivity" swapped="no"/>
                                   </object>
@@ -269,17 +268,17 @@
                                 </child>
                                 <child>
                                   <object class="GtkEntry" id="page_range_entry">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">Specify one or more page ranges,
+                                    <property name="visible">1</property>
+                                    <property name="sensitive">0</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="tooltip_text" translatable="1">Specify one or more page ranges,
  e.g. 1–3, 7, 11</property>
                                     <property name="invisible_char">•</property>
-                                    <property name="activates_default">True</property>
+                                    <property name="activates_default">1</property>
                                     <child internal-child="accessible">
                                       <object class="AtkObject" id="page_range_entry-atkobject">
-                                        <property name="AtkObject::accessible-name" translatable="yes">Pages</property>
-                                        <property name="AtkObject::accessible-description" translatable="yes">Specify one or more page ranges,
+                                        <property name="AtkObject::accessible-name" translatable="1">Pages</property>
+                                        <property name="AtkObject::accessible-description" translatable="1">Specify one or more page ranges,
  e.g. 1–3, 7, 11</property>
                                       </object>
                                     </child>
@@ -294,26 +293,26 @@
                                 </accessibility>
                               </object>
                               <packing>
-                                <property name="fill">False</property>
+                                <property name="fill">0</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
+                            <property name="expand">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="frame_template2">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="label_widget2">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
-                                <property name="label" translatable="yes">Copies</property>
+                                <property name="label" translatable="1">Copies</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -322,22 +321,22 @@
                                 </accessibility>
                               </object>
                               <packing>
-                                <property name="fill">False</property>
+                                <property name="fill">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkGrid" id="grid1">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="margin_start">12</property>
                                 <property name="row_spacing">6</property>
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkLabel" id="label4">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">center</property>
-                                    <property name="label" translatable="yes">Copie_s:</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="label" translatable="1">Copie_s:</property>
+                                    <property name="use_underline">1</property>
                                     <property name="mnemonic_widget">copies_spin</property>
                                   </object>
                                   <packing>
@@ -347,10 +346,10 @@
                                 </child>
                                 <child>
                                   <object class="GtkSpinButton" id="copies_spin">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
                                     <property name="invisible_char">•</property>
-                                    <property name="activates_default">True</property>
+                                    <property name="activates_default">1</property>
                                     <property name="adjustment">copies_spin_adjustment</property>
                                     <signal name="changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
                                     <signal name="value-changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
@@ -362,11 +361,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="collate_check">
-                                    <property name="label" translatable="yes">C_ollate</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">C_ollate</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="use_underline">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                   </object>
                                   <packing>
@@ -376,11 +375,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="reverse_check">
-                                    <property name="label" translatable="yes">_Reverse</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="label" translatable="1">_Reverse</property>
+                                    <property name="visible">1</property>
+                                    <property name="can_focus">1</property>
+                                    <property name="use_underline">1</property>
+                                    <property name="draw_indicator">1</property>
                                     <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                   </object>
                                   <packing>
@@ -392,7 +391,7 @@
                                   <object class="GtkDrawingArea" id="collate_image">
                                     <property name="width_request">70</property>
                                     <property name="height_request">90</property>
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <signal name="draw" handler="draw_collate_cb" swapped="no"/>
                                   </object>
                                   <packing>
@@ -406,19 +405,19 @@
                                 </accessibility>
                               </object>
                               <packing>
-                                <property name="fill">False</property>
+                                <property name="fill">0</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
+                            <property name="expand">1</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="fill">False</property>
+                        <property name="fill">0</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -426,34 +425,34 @@
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">General</property>
+                    <property name="visible">1</property>
+                    <property name="label" translatable="1">General</property>
                   </object>
                   <packing>
-                    <property name="tab_fill">False</property>
+                    <property name="tab_fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="page_setup_main_box">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="border_width">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
                     <child>
                       <object class="GtkBox" id="box4">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="spacing">18</property>
                         <child>
                           <object class="GtkBox" id="frame_template3">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="label_widget3">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
-                                <property name="label" translatable="yes">Layout</property>
+                                <property name="label" translatable="1">Layout</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -462,22 +461,22 @@
                                 </accessibility>
                               </object>
                               <packing>
-                                <property name="fill">False</property>
+                                <property name="fill">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkGrid" id="grid2">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="margin_start">12</property>
                                 <property name="row_spacing">6</property>
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkLabel" id="label5">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
-                                    <property name="label" translatable="yes">T_wo-sided:</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="label" translatable="1">T_wo-sided:</property>
+                                    <property name="use_underline">1</property>
                                     <property name="mnemonic_widget">duplex</property>
                                   </object>
                                   <packing>
@@ -498,11 +497,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label6">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
-                                    <property name="label" translatable="yes">Pages per _side:</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="label" translatable="1">Pages per _side:</property>
+                                    <property name="use_underline">1</property>
                                     <property name="mnemonic_widget">pages_per_sheet</property>
                                   </object>
                                   <packing>
@@ -525,11 +524,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label7">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
-                                    <property name="label" translatable="yes">Page or_dering:</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="label" translatable="1">Page or_dering:</property>
+                                    <property name="use_underline">1</property>
                                     <property name="mnemonic_widget">number_up_layout</property>
                                   </object>
                                   <packing>
@@ -551,11 +550,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label8">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
-                                    <property name="label" translatable="yes">_Only print:</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="label" translatable="1">_Only print:</property>
+                                    <property name="use_underline">1</property>
                                     <property name="mnemonic_widget">page_set_combo</property>
                                   </object>
                                   <packing>
@@ -565,7 +564,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkComboBoxText" id="page_set_combo">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="valign">baseline</property>
                                     <property name="active">0</property>
                                     <property name="entry_text_column">0</property>
@@ -583,11 +582,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label9">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
-                                    <property name="label" translatable="yes">Sc_ale:</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="label" translatable="1">Sc_ale:</property>
+                                    <property name="use_underline">1</property>
                                     <property name="mnemonic_widget">scale_spin</property>
                                   </object>
                                   <packing>
@@ -597,13 +596,13 @@
                                 </child>
                                 <child>
                                   <object class="GtkBox" id="box5">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkSpinButton" id="scale_spin">
-                                        <property name="visible">True</property>
+                                        <property name="visible">1</property>
                                         <property name="valign">baseline</property>
-                                        <property name="can_focus">True</property>
+                                        <property name="can_focus">1</property>
                                         <property name="invisible_char">•</property>
                                         <property name="adjustment">scale_spin_adjustment</property>
                                         <property name="digits">1</property>
@@ -611,7 +610,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label10">
-                                        <property name="visible">True</property>
+                                        <property name="visible">1</property>
                                         <property name="valign">baseline</property>
                                         <property name="label">%</property>
                                       </object>
@@ -630,26 +629,26 @@
                                 </accessibility>
                               </object>
                               <packing>
-                                <property name="fill">False</property>
+                                <property name="fill">0</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
+                            <property name="expand">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="frame_template4">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="label_widget4">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
-                                <property name="label" translatable="yes">Paper</property>
+                                <property name="label" translatable="1">Paper</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
                                 </attributes>
@@ -658,22 +657,22 @@
                                 </accessibility>
                               </object>
                               <packing>
-                                <property name="fill">False</property>
+                                <property name="fill">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkGrid" id="grid3">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="margin_start">12</property>
                                 <property name="row_spacing">6</property>
                                 <property name="column_spacing">12</property>
                                 <child>
                                   <object class="GtkLabel" id="label11">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
-                                    <property name="label" translatable="yes">Paper _type:</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="label" translatable="1">Paper _type:</property>
+                                    <property name="use_underline">1</property>
                                     <property name="mnemonic_widget">paper_type</property>
                                   </object>
                                   <packing>
@@ -694,11 +693,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label12">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
-                                    <property name="label" translatable="yes">Paper _source:</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="label" translatable="1">Paper _source:</property>
+                                    <property name="use_underline">1</property>
                                     <property name="mnemonic_widget">paper_source</property>
                                   </object>
                                   <packing>
@@ -719,11 +718,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label13">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
-                                    <property name="label" translatable="yes">Output t_ray:</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="label" translatable="1">Output t_ray:</property>
+                                    <property name="use_underline">1</property>
                                     <property name="mnemonic_widget">output_tray</property>
                                   </object>
                                   <packing>
@@ -744,11 +743,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="paper_size_combo_label">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
-                                    <property name="label" translatable="yes">_Paper size:</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="label" translatable="1">_Paper size:</property>
+                                    <property name="use_underline">1</property>
                                     <property name="mnemonic_widget">paper_size_combo</property>
                                   </object>
                                   <packing>
@@ -758,8 +757,8 @@
                                 </child>
                                 <child>
                                   <object class="GtkComboBox" id="paper_size_combo">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
+                                    <property name="visible">1</property>
+                                    <property name="sensitive">0</property>
                                     <property name="model">page_setup_list</property>
                                     <property name="valign">baseline</property>
                                     <child>
@@ -773,11 +772,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="orientation_combo_label">
-                                    <property name="visible">True</property>
+                                    <property name="visible">1</property>
                                     <property name="halign">start</property>
                                     <property name="valign">baseline</property>
-                                    <property name="label" translatable="yes">Or_ientation:</property>
-                                    <property name="use_underline">True</property>
+                                    <property name="label" translatable="1">Or_ientation:</property>
+                                    <property name="use_underline">1</property>
                                     <property name="mnemonic_widget">orientation_combo</property>
                                   </object>
                                   <packing>
@@ -787,8 +786,8 @@
                                 </child>
                                 <child>
                                   <object class="GtkComboBoxText" id="orientation_combo">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
+                                    <property name="visible">1</property>
+                                    <property name="sensitive">0</property>
                                     <property name="active">0</property>
                                     <property name="entry_text_column">0</property>
                                     <property name="valign">baseline</property>
@@ -810,39 +809,39 @@
                                 </accessibility>
                               </object>
                               <packing>
-                                <property name="fill">False</property>
+                                <property name="fill">0</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
+                            <property name="expand">1</property>
                             <property name="padding">6</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="fill">False</property>
+                        <property name="fill">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="box6">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <child>
                           <object class="GtkDrawingArea" id="page_layout_preview">
                             <property name="width_request">320</property>
                             <property name="height_request">160</property>
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <signal name="draw" handler="draw_page_cb" swapped="no"/>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
+                            <property name="expand">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">1</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -853,12 +852,12 @@
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Page Setup</property>
+                    <property name="visible">1</property>
+                    <property name="label" translatable="1">Page Setup</property>
                   </object>
                   <packing>
                     <property name="position">1</property>
-                    <property name="tab_fill">False</property>
+                    <property name="tab_fill">0</property>
                   </packing>
                 </child>
                 <child>
@@ -868,15 +867,15 @@
                     <property name="column_spacing">18</property>
                     <child>
                       <object class="GtkBox" id="frame_template5">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_widget5">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="halign">start</property>
                             <property name="valign">center</property>
-                            <property name="label" translatable="yes">Job Details</property>
+                            <property name="label" translatable="1">Job Details</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -885,22 +884,22 @@
                             </accessibility>
                           </object>
                           <packing>
-                            <property name="fill">False</property>
+                            <property name="fill">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkGrid" id="grid5">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">12</property>
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkLabel" id="label16">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
-                                <property name="label" translatable="yes">Pri_ority:</property>
-                                <property name="use_underline">True</property>
+                                <property name="label" translatable="1">Pri_ority:</property>
+                                <property name="use_underline">1</property>
                                 <property name="mnemonic_widget">job_prio</property>
                               </object>
                               <packing>
@@ -920,11 +919,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="label17">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
-                                <property name="label" translatable="yes">_Billing info:</property>
-                                <property name="use_underline">True</property>
+                                <property name="label" translatable="1">_Billing info:</property>
+                                <property name="use_underline">1</property>
                                 <property name="mnemonic_widget">billing_info</property>
                               </object>
                               <packing>
@@ -947,7 +946,7 @@
                             </accessibility>
                           </object>
                           <packing>
-                            <property name="fill">False</property>
+                            <property name="fill">0</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -959,15 +958,15 @@
                     </child>
                     <child>
                       <object class="GtkBox" id="frame_template6">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_widget6">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="halign">start</property>
                             <property name="valign">center</property>
-                            <property name="label" translatable="yes">Print Document</property>
+                            <property name="label" translatable="1">Print Document</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -976,23 +975,23 @@
                             </accessibility>
                           </object>
                           <packing>
-                            <property name="fill">False</property>
+                            <property name="fill">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkGrid" id="grid6">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">12</property>
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkRadioButton" id="print_now_radio">
-                                <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog">_Now</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="use_underline">True</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="1" comments="this is one of the choices for the print at option in the print dialog">_Now</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="use_underline">1</property>
+                                <property name="active">1</property>
+                                <property name="draw_indicator">1</property>
                                 <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                               </object>
                               <packing>
@@ -1003,16 +1002,16 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="print_at_radio">
-                                <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It also serves as the label for an entry that allows the user to enter a time.">A_t:</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="has_tooltip">True</property>
-                                <property name="tooltip_markup" translatable="yes">Specify the time of print,
+                                <property name="label" translatable="1" comments="this is one of the choices for the print at option in the print dialog. It also serves as the label for an entry that allows the user to enter a time.">A_t:</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="has_tooltip">1</property>
+                                <property name="tooltip_markup" translatable="1">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                <property name="tooltip_text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
+                                <property name="tooltip_text" translatable="1" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="use_underline">1</property>
+                                <property name="draw_indicator">1</property>
                                 <property name="group">print_now_radio</property>
                                 <signal name="toggled" handler="update_print_at_entry_sensitivity" swapped="no"/>
                                 <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
@@ -1024,20 +1023,20 @@
                             </child>
                             <child>
                               <object class="GtkEntry" id="print_at_entry">
-                                <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="can_focus">True</property>
-                                <property name="has_tooltip">True</property>
-                                <property name="tooltip_markup" translatable="yes">Specify the time of print,
+                                <property name="visible">1</property>
+                                <property name="sensitive">0</property>
+                                <property name="can_focus">1</property>
+                                <property name="has_tooltip">1</property>
+                                <property name="tooltip_markup" translatable="1">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
-                                <property name="tooltip_text" translatable="yes" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
+                                <property name="tooltip_text" translatable="1" comments="Ability to parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if they are not supported.">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
                                 <property name="invisible_char">•</property>
-                                <property name="invisible_char_set">True</property>
+                                <property name="invisible_char_set">1</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="print_at_entry-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">Time of print</property>
-                                    <property name="AtkObject::accessible-description" translatable="yes">Specify the time of print,
+                                    <property name="AtkObject::accessible-name" translatable="1">Time of print</property>
+                                    <property name="AtkObject::accessible-description" translatable="1">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
                                   </object>
                                 </child>
@@ -1050,14 +1049,14 @@
                             </child>
                             <child>
                               <object class="GtkRadioButton" id="print_hold_radio">
-                                <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It means that the print job will not be printed until it explicitly gets &apos;released&apos;.">On _hold</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="has_tooltip">True</property>
-                                <property name="tooltip_markup" translatable="yes">Hold the job until it is explicitly released</property>
-                                <property name="tooltip_text" translatable="yes">Hold the job until it is explicitly released</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="1" comments="this is one of the choices for the print at option in the print dialog. It means that the print job will not be printed until it explicitly gets &apos;released&apos;.">On _hold</property>
+                                <property name="visible">1</property>
+                                <property name="can_focus">1</property>
+                                <property name="has_tooltip">1</property>
+                                <property name="tooltip_markup" translatable="1">Hold the job until it is explicitly released</property>
+                                <property name="tooltip_text" translatable="1">Hold the job until it is explicitly released</property>
+                                <property name="use_underline">1</property>
+                                <property name="draw_indicator">1</property>
                                 <property name="group">print_now_radio</property>
                                 <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
                               </object>
@@ -1072,7 +1071,7 @@
                             </accessibility>
                           </object>
                           <packing>
-                            <property name="fill">False</property>
+                            <property name="fill">0</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1084,15 +1083,15 @@
                     </child>
                     <child>
                       <object class="GtkBox" id="frame_template7">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_widget7">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="halign">start</property>
                             <property name="valign">center</property>
-                            <property name="label" translatable="yes">Add Cover Page</property>
+                            <property name="label" translatable="1">Add Cover Page</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -1101,22 +1100,22 @@
                             </accessibility>
                           </object>
                           <packing>
-                            <property name="fill">False</property>
+                            <property name="fill">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkGrid" id="grid7">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="margin_start">12</property>
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
                             <child>
                               <object class="GtkLabel" id="label18">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
-                                <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the front cover page.">Be_fore:</property>
-                                <property name="use_underline">True</property>
+                                <property name="label" translatable="1" comments="this is the label used for the option in the print dialog that controls the front cover page.">Be_fore:</property>
+                                <property name="use_underline">1</property>
                                 <property name="mnemonic_widget">cover_before</property>
                               </object>
                               <packing>
@@ -1136,11 +1135,11 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="label19">
-                                <property name="visible">True</property>
+                                <property name="visible">1</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
-                                <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the back cover page.">_After:</property>
-                                <property name="use_underline">True</property>
+                                <property name="label" translatable="1" comments="this is the label used for the option in the print dialog that controls the back cover page.">_After:</property>
+                                <property name="use_underline">1</property>
                                 <property name="mnemonic_widget">cover_after</property>
                               </object>
                               <packing>
@@ -1163,7 +1162,7 @@
                             </accessibility>
                           </object>
                           <packing>
-                            <property name="fill">False</property>
+                            <property name="fill">0</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1180,25 +1179,25 @@
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Job</property>
+                    <property name="visible">1</property>
+                    <property name="label" translatable="1">Job</property>
                   </object>
                   <packing>
                     <property name="position">2</property>
-                    <property name="tab_fill">False</property>
+                    <property name="tab_fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkScrolledWindow" id="image_quality_page">
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">1</property>
                     <property name="hscrollbar_policy">never</property>
                     <child>
                       <object class="GtkViewport" id="viewport1">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkGrid" id="image_quality_table">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="border_width">12</property>
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
@@ -1213,25 +1212,25 @@
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="label20">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog.">Image Quality</property>
+                    <property name="visible">1</property>
+                    <property name="label" translatable="1" comments="This will appear as a tab label in the print dialog.">Image Quality</property>
                   </object>
                   <packing>
                     <property name="position">3</property>
-                    <property name="tab_fill">False</property>
+                    <property name="tab_fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkScrolledWindow" id="color_page">
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">1</property>
                     <property name="hscrollbar_policy">never</property>
                     <child>
                       <object class="GtkViewport" id="viewport2">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkGrid" id="color_table">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="border_width">12</property>
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
@@ -1246,25 +1245,25 @@
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="label21">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog.">Color</property>
+                    <property name="visible">1</property>
+                    <property name="label" translatable="1" comments="This will appear as a tab label in the print dialog.">Color</property>
                   </object>
                   <packing>
                     <property name="position">4</property>
-                    <property name="tab_fill">False</property>
+                    <property name="tab_fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkScrolledWindow" id="finishing_page">
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">1</property>
                     <property name="hscrollbar_policy">never</property>
                     <child>
                       <object class="GtkViewport" id="viewport3">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkGrid" id="finishing_table">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="border_width">12</property>
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
@@ -1279,26 +1278,25 @@
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="label22">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes" comments="This will appear as a tab label in the print dialog.
-It&apos;s a typographical term, as in &quot;Binding and finishing&quot;">Finishing</property>
+                    <property name="visible">1</property>
+                    <property name="label" translatable="1" comments="This will appear as a tab label in the print dialog. It&apos;s a typographical term, as in &quot;Binding and finishing&quot;">Finishing</property>
                   </object>
                   <packing>
                     <property name="position">5</property>
-                    <property name="tab_fill">False</property>
+                    <property name="tab_fill">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkScrolledWindow" id="advanced_page">
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">1</property>
                     <property name="hscrollbar_policy">never</property>
                     <child>
                       <object class="GtkViewport" id="viewport4">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="shadow_type">none</property>
                         <child>
                           <object class="GtkBox" id="advanced_vbox">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="border_width">12</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">18</property>
@@ -1313,44 +1311,44 @@ It&apos;s a typographical term, as in &quot;Binding and finishing&quot;">Finishi
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="label23">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Advanced</property>
+                    <property name="visible">1</property>
+                    <property name="label" translatable="1">Advanced</property>
                   </object>
                   <packing>
                     <property name="position">6</property>
-                    <property name="tab_fill">False</property>
+                    <property name="tab_fill">0</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkActionBar" id="conflicts_widget">
                 <child>
                   <object class="GtkImage" id="image1">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="icon_name">dialog-warning-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label24">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Some of the settings in the dialog conflict</property>
+                    <property name="visible">1</property>
+                    <property name="label" translatable="1">Some of the settings in the dialog conflict</property>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="fill">False</property>
+                <property name="fill">0</property>
                 <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">1</property>
           </packing>
         </child>
       </object>
diff --git a/gtk/ui/gtkrecentchooserdefault.ui b/gtk/ui/gtkrecentchooserdefault.ui
index ca4d748f73..be03a23c67 100644
--- a/gtk/ui/gtkrecentchooserdefault.ui
+++ b/gtk/ui/gtkrecentchooserdefault.ui
@@ -17,17 +17,17 @@
     <property name="spacing">6</property>
     <child>
       <object class="GtkScrolledWindow" id="scrolledwindow">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
+        <property name="visible">1</property>
+        <property name="can_focus">1</property>
         <property name="hscrollbar_policy">never</property>
         <property name="shadow_type">in</property>
-        <property name="vexpand">True</property>
+        <property name="vexpand">1</property>
         <child>
           <object class="GtkTreeView" id="recent_view">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="has_tooltip">True</property>
-            <property name="headers_visible">False</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="has_tooltip">1</property>
+            <property name="headers_visible">0</property>
             <signal name="button-press-event" handler="recent_view_button_press_cb" swapped="no"/>
             <signal name="drag-begin" handler="recent_view_drag_begin_cb" swapped="no"/>
             <signal name="drag-data-get" handler="recent_view_drag_data_get_cb" swapped="no"/>
@@ -52,7 +52,7 @@
             <child>
               <object class="GtkTreeViewColumn" id="meta_column">
                 <property name="title">meta</property>
-                <property name="expand">True</property>
+                <property name="expand">1</property>
                 <child>
                   <object class="GtkCellRendererText" id="meta_renderer">
                     <property name="ellipsize">end</property>
@@ -74,15 +74,15 @@
         <property name="spacing">12</property>
         <child>
           <object class="GtkComboBoxText" id="filter_combo">
-            <property name="visible">True</property>
-            <property name="tooltip_text" translatable="yes">Select which type of documents are shown</property>
-            <property name="focus_on_click">False</property>
+            <property name="visible">1</property>
+            <property name="tooltip_text" translatable="1">Select which type of documents are shown</property>
+            <property name="focus_on_click">0</property>
             <property name="entry_text_column">0</property>
             <property name="id_column">1</property>
             <signal name="changed" handler="filter_combo_changed_cb" swapped="no"/>
           </object>
           <packing>
-            <property name="fill">False</property>
+            <property name="fill">0</property>
             <property name="pack_type">end</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkscalebutton.ui b/gtk/ui/gtkscalebutton.ui
index 5ab20bb4df..bea8bccdbe 100644
--- a/gtk/ui/gtkscalebutton.ui
+++ b/gtk/ui/gtkscalebutton.ui
@@ -3,15 +3,15 @@
   <!-- interface-requires gtk+ 3.10 -->
   <!-- interface-requires gtkprivate 3.10 -->
   <template class="GtkScaleButton" parent="GtkButton">
-    <property name="can_focus">True</property>
-    <property name="receives_default">True</property>
+    <property name="can_focus">1</property>
+    <property name="receives_default">1</property>
     <property name="relief">none</property>
-    <property name="focus_on_click">False</property>
+    <property name="focus_on_click">0</property>
     <child>
       <object class="GtkImage" id="image">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="icon_name">image-missing</property>
-        <property name="use-fallback">True</property>
+        <property name="use-fallback">1</property>
       </object>
     </child>
   </template>
@@ -27,15 +27,15 @@
     </style>
     <child>
       <object class="GtkBox" id="box">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="orientation">vertical</property>
         <property name="margin">4</property>
         <property name="spacing">4</property>
         <child>
           <object class="GtkButton" id="plus_button">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="relief">none</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
@@ -44,9 +44,9 @@
             </style>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">list-add-symbolic</property>
-                <property name="use-fallback">True</property>
+                <property name="use-fallback">1</property>
               </object>
             </child>
             <signal name="button-press-event" handler="cb_button_press" swapped="no"/>
@@ -54,19 +54,19 @@
             <signal name="clicked" handler="cb_button_clicked" swapped="no"/>
           </object>
           <packing>
-            <property name="fill">False</property>
+            <property name="fill">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkScale" id="scale">
             <property name="height_request">100</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
             <property name="orientation">vertical</property>
             <property name="adjustment">adjustment</property>
-            <property name="inverted">True</property>
+            <property name="inverted">1</property>
             <property name="round_digits">1</property>
-            <property name="draw_value">False</property>
+            <property name="draw_value">0</property>
             <signal name="value-changed" handler="cb_scale_value_changed" swapped="no"/>
           </object>
           <packing>
@@ -75,9 +75,9 @@
         </child>
         <child>
           <object class="GtkButton" id="minus_button">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="relief">none</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
@@ -86,9 +86,9 @@
             </style>
             <child>
               <object class="GtkImage">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="icon-name">list-remove-symbolic</property>
-                <property name="use-fallback">True</property>
+                <property name="use-fallback">1</property>
               </object>
             </child>
             <signal name="button-press-event" handler="cb_button_press" swapped="no"/>
@@ -96,7 +96,7 @@
             <signal name="clicked" handler="cb_button_clicked" swapped="no"/>
           </object>
           <packing>
-            <property name="fill">False</property>
+            <property name="fill">0</property>
             <property name="position">2</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtksearchbar.ui b/gtk/ui/gtksearchbar.ui
index 89a27eab05..0d7197f395 100644
--- a/gtk/ui/gtksearchbar.ui
+++ b/gtk/ui/gtksearchbar.ui
@@ -2,31 +2,30 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkSearchBar" parent="GtkBin">
-    <property name="app_paintable">True</property>
+    <property name="app_paintable">1</property>
     <child>
       <object class="GtkRevealer" id="revealer">
-        <property name="visible">True</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">False</property>
+        <property name="visible">1</property>
+        <property name="hexpand">1</property>
         <child>
           <object class="GtkBox" id="tool_box">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="border_width">6</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="box_left">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">start</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <property name="orientation">vertical</property>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox" id="box_center">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">center</property>
                 <property name="orientation">vertical</property>
               </object>
@@ -36,15 +35,15 @@
             </child>
             <child>
               <object class="GtkBox" id="box_right">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">end</property>
-                <property name="hexpand">True</property>
+                <property name="hexpand">1</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkButton" id="close_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                     <property name="relief">none</property>
                     <style>
                       <class name="raised"/>
@@ -52,14 +51,14 @@
                     </style>
                     <child>
                       <object class="GtkImage" id="close_image">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="icon_size">1</property>
                         <property name="icon_name">window-close-symbolic</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
+                    <property name="expand">1</property>
                   </packing>
                 </child>
               </object>
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index 67fc446015..92fcf86508 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -9,21 +9,21 @@
     </style>
     <child>
       <object class="GtkRevealer" id="revealer">
-        <property name="visible">True</property>
-        <property name="reveal-child">True</property>
+        <property name="visible">1</property>
+        <property name="reveal-child">1</property>
         <signal name="notify::child-revealed" handler="on_child_revealed"/>
         <style>
           <class name="sidebar-revealer"/>
         </style>
         <child>
           <object class="GtkEventBox" id="event_box">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <child>
               <object class="GtkGrid">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <child>
                   <object class="GtkImage" id="icon_widget">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <style>
                       <class name="sidebar-icon"/>
                     </style>
@@ -35,8 +35,8 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="label_widget">
-                    <property name="visible">True</property>
-                    <property name="hexpand">True</property>
+                    <property name="visible">1</property>
+                    <property name="hexpand">1</property>
                     <property name="xalign">0</property>
                     <style>
                       <class name="sidebar-label"/>
@@ -49,14 +49,14 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="eject_button">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="margin-start">4px</property>
-                    <property name="no-show-all">True</property>
+                    <property name="no-show-all">1</property>
                     <child>
                       <object class="GtkImage">
-                        <property name="visible">True</property>
+                        <property name="visible">1</property>
                         <property name="icon_name">media-eject-symbolic</property>
                         <property name="icon_size">1</property>
                       </object>
diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui
index 1419abc4c9..8dbd537a7e 100644
--- a/gtk/ui/gtkstatusbar.ui
+++ b/gtk/ui/gtkstatusbar.ui
@@ -9,29 +9,28 @@
     <property name="margin_bottom">6</property>
     <child>
       <object class="GtkFrame" id="frame">
-        <property name="visible">True</property>
+        <property name="visible">1</property>
         <property name="shadow_type">none</property>
         <child>
           <object class="GtkBox" id="message_area">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="spacing">4</property>
             <property name="margin">4</property>
             <child>
               <object class="GtkLabel" id="label">
-                <property name="visible">True</property>
+                <property name="visible">1</property>
                 <property name="halign">start</property>
                 <property name="valign">center</property>
                 <property name="ellipsize">end</property>
-                <property name="single_line_mode">True</property>
+                <property name="single_line_mode">1</property>
               </object>
             </child>
           </object>
         </child>
-        <child type="label_item">
-        </child>
+        <child type="label_item"/>
       </object>
       <packing>
-        <property name="expand">True</property>
+        <property name="expand">1</property>
       </packing>
     </child>
   </template>
diff --git a/gtk/ui/gtkvolumebutton.ui b/gtk/ui/gtkvolumebutton.ui
index e4162f5739..832ed6d8f7 100644
--- a/gtk/ui/gtkvolumebutton.ui
+++ b/gtk/ui/gtkvolumebutton.ui
@@ -7,12 +7,12 @@
     <property name="page_increment">0.2</property>
   </object>
   <template class="GtkVolumeButton" parent="GtkScaleButton">
-    <property name="visible">True</property>
-    <property name="can_focus">True</property>
-    <property name="receives_default">True</property>
-    <property name="has_tooltip">True</property>
+    <property name="visible">1</property>
+    <property name="can_focus">1</property>
+    <property name="receives_default">1</property>
+    <property name="has_tooltip">1</property>
     <property name="relief">none</property>
-    <property name="focus_on_click">False</property>
+    <property name="focus_on_click">0</property>
     <property name="orientation">vertical</property>
     <property name="adjustment">adjustment</property>
     <property name="icons">audio-volume-muted
@@ -21,8 +21,8 @@ audio-volume-low
 audio-volume-medium</property>
     <child internal-child="accessible">
       <object class="AtkObject" id="GtkVolumeButton-atkobject">
-        <property name="AtkObject::accessible-name" translatable="yes">Volume</property>
-        <property name="AtkObject::accessible-description" translatable="yes">Turns volume up or down</property>
+        <property name="AtkObject::accessible-name" translatable="1">Volume</property>
+        <property name="AtkObject::accessible-description" translatable="1">Turns volume up or down</property>
       </object>
     </child>
     <signal name="query-tooltip" handler="cb_query_tooltip" swapped="no"/>
@@ -31,8 +31,8 @@ audio-volume-medium</property>
       <object class="GtkButton" id="scalebutton-plus_button1">
         <child internal-child="accessible">
           <object class="AtkObject" id="scalebutton-plus_button1-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Volume Up</property>
-            <property name="AtkObject::accessible-description" translatable="yes">Increases the volume</property>
+            <property name="AtkObject::accessible-name" translatable="1">Volume Up</property>
+            <property name="AtkObject::accessible-description" translatable="1">Increases the volume</property>
           </object>
         </child>
       </object>
@@ -41,8 +41,8 @@ audio-volume-medium</property>
       <object class="GtkButton" id="scalebutton-minus_button1">
         <child internal-child="accessible">
           <object class="AtkObject" id="scalebutton-minus_button1-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes">Volume Down</property>
-            <property name="AtkObject::accessible-description" translatable="yes">Decreases the volume</property>
+            <property name="AtkObject::accessible-name" translatable="1">Volume Down</property>
+            <property name="AtkObject::accessible-description" translatable="1">Decreases the volume</property>
           </object>
         </child>
       </object>
-- 
2.30.2